[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.366,1.367 script.cpp,1.221,1.222 script_v6he.cpp,2.157,2.158 script_v7he.cpp,2.156,2.157 scumm.h,1.629,1.630 string.cpp,1.291,1.292
Max Horn
fingolfin at users.sourceforge.net
Thu May 26 07:15:49 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26462
Modified Files:
actor.cpp script.cpp script_v6he.cpp script_v7he.cpp scumm.h
string.cpp
Log Message:
Changed name of addMessageToStack to convertMessageToString (still not really happy with that name but at least it is a little bit more descriptive than the old)
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- actor.cpp 25 May 2005 09:17:31 -0000 1.366
+++ actor.cpp 26 May 2005 14:14:25 -0000 1.367
@@ -1296,7 +1296,7 @@
void ScummEngine::actorTalk(const byte *msg) {
Actor *a;
- addMessageToStack(msg, _charsetBuffer, sizeof(_charsetBuffer));
+ convertMessageToString(msg, _charsetBuffer, sizeof(_charsetBuffer));
// FIXME: Workaround for bugs #770039 and #770049
if (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- script.cpp 18 May 2005 16:15:56 -0000 1.221
+++ script.cpp 26 May 2005 14:14:27 -0000 1.222
@@ -1086,7 +1086,7 @@
num++;
// WORKAROUND for bug #985948, a script bug in Indy3. See also
- // the corresponding code in ScummEngine::addMessageToStack().
+ // the corresponding code in ScummEngine::convertMessageToString().
if (_gameId == GID_INDY3 && chr == 0x2E) {
continue;
}
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -d -r2.157 -r2.158
--- script_v6he.cpp 10 May 2005 22:56:10 -0000 2.157
+++ script_v6he.cpp 26 May 2005 14:14:28 -0000 2.158
@@ -729,7 +729,7 @@
int slot = pop();
int len = resStrLen(string) + 1;
- addMessageToStack(string, a->_heTalkQueue[slot].sentence, len);
+ convertMessageToString(string, a->_heTalkQueue[slot].sentence, len);
a->_heTalkQueue[slot].posX = a->_talkPosX;
a->_heTalkQueue[slot].posY = a->_talkPosY;
@@ -985,7 +985,7 @@
int mode, len, slot, l, r;
byte filename[100];
- addMessageToStack(_scriptPointer, filename, sizeof(filename));
+ convertMessageToString(_scriptPointer, filename, sizeof(filename));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
@@ -1035,7 +1035,7 @@
int len, r;
byte filename[100];
- addMessageToStack(_scriptPointer, filename, sizeof(filename));
+ convertMessageToString(_scriptPointer, filename, sizeof(filename));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
@@ -1052,7 +1052,7 @@
int len, r1, r2;
byte filename[100],filename2[100];
- addMessageToStack(_scriptPointer, filename, sizeof(filename));
+ convertMessageToString(_scriptPointer, filename, sizeof(filename));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
@@ -1062,7 +1062,7 @@
break;
}
- addMessageToStack(_scriptPointer, filename2, sizeof(filename2));
+ convertMessageToString(_scriptPointer, filename2, sizeof(filename2));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.156
retrieving revision 2.157
diff -u -d -r2.156 -r2.157
--- script_v7he.cpp 23 May 2005 02:00:48 -0000 2.156
+++ script_v7he.cpp 26 May 2005 14:14:30 -0000 2.157
@@ -906,7 +906,7 @@
const char *entry;
int len, type;
- addMessageToStack(_scriptPointer, option, sizeof(option));
+ convertMessageToString(_scriptPointer, option, sizeof(option));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
@@ -941,7 +941,7 @@
type = pop();
value = pop();
- addMessageToStack(_scriptPointer, option, sizeof(option));
+ convertMessageToString(_scriptPointer, option, sizeof(option));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
@@ -950,7 +950,7 @@
ConfMan.set((char *)option, value);
break;
case 2: // string
- addMessageToStack(_scriptPointer, string, sizeof(string));
+ convertMessageToString(_scriptPointer, string, sizeof(string));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
ConfMan.set((char *)option, (char *)string);
@@ -1030,7 +1030,7 @@
int len;
byte filename[100];
- addMessageToStack(_scriptPointer, filename, sizeof(filename));
+ convertMessageToString(_scriptPointer, filename, sizeof(filename));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -d -r1.629 -r1.630
--- scumm.h 19 May 2005 14:15:24 -0000 1.629
+++ scumm.h 26 May 2005 14:14:31 -0000 1.630
@@ -1158,11 +1158,11 @@
void unkMessage1(const byte *msg);
void showMessageDialog(const byte *msg);
- int addMessageToStack(const byte *msg, byte *dst, int dstSize);
- int addIntToStack(byte *dst, int dstSize, int var);
- int addVerbToStack(byte *dst, int dstSize, int var);
- int addNameToStack(byte *dst, int dstSize, int var);
- int addStringToStack(byte *dst, int dstSize, int var);
+ int convertMessageToString(const byte *msg, byte *dst, int dstSize);
+ int convertIntMessage(byte *dst, int dstSize, int var);
+ int convertVerbMessage(byte *dst, int dstSize, int var);
+ int convertNameMessage(byte *dst, int dstSize, int var);
+ int convertStringMessage(byte *dst, int dstSize, int var);
virtual void loadLanguageBundle() {}
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- string.cpp 14 May 2005 22:56:41 -0000 1.291
+++ string.cpp 26 May 2005 14:14:32 -0000 1.292
@@ -56,7 +56,7 @@
void ScummEngine::unkMessage1(const byte *msg) {
byte buffer[500];
- addMessageToStack(msg, buffer, sizeof(buffer));
+ convertMessageToString(msg, buffer, sizeof(buffer));
// if ((_gameId == GID_CMI) && _debugMode) { // In CMI, unkMessage1 is used for printDebug output
if ((buffer[0] != 0xFF) && _debugMode) {
@@ -86,7 +86,7 @@
// Seemed to use blastText for the messages
byte buf[500];
- addMessageToStack(msg, buf, sizeof(buf));
+ convertMessageToString(msg, buf, sizeof(buf));
if (_string[3].color == 0)
_string[3].color = 4;
@@ -444,7 +444,7 @@
bool cmi_pos_hack = false;
- addMessageToStack(msg, buf, sizeof(buf));
+ convertMessageToString(msg, buf, sizeof(buf));
_charset->_top = _string[a].ypos + _screenTop;
_charset->_startLeft = _charset->_left = _string[a].xpos;
@@ -580,7 +580,7 @@
_string[a].xpos = _charset->_str.right + 8; // Indy3: Fixes Grail Diary text positioning
}
-int ScummEngine::addMessageToStack(const byte *msg, byte *dst, int dstSize) {
+int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize) {
uint num = 0;
uint32 val;
byte chr;
@@ -592,7 +592,7 @@
end = dst + dstSize;
if (msg == NULL) {
- warning("Bad message in addMessageToStack, ignoring");
+ warning("Bad message in convertMessageToString, ignoring");
return 0;
}
@@ -637,16 +637,16 @@
val = (_version == 8) ? READ_LE_UINT32(src + num) : READ_LE_UINT16(src + num);
switch (chr) {
case 4:
- dst += addIntToStack(dst, end - dst, val);
+ dst += convertIntMessage(dst, end - dst, val);
break;
case 5:
- dst += addVerbToStack(dst, end - dst, val);
+ dst += convertVerbMessage(dst, end - dst, val);
break;
case 6:
dst += addNameToStack(dst, end - dst, val);
break;
case 7:
- dst += addStringToStack(dst, end - dst, val);
+ dst += convertStringMessage(dst, end - dst, val);
break;
case 9:
case 10:
@@ -664,7 +664,7 @@
}
break;
default:
- warning("addMessageToStack(): string escape sequence %d unknown", chr);
+ warning("convertMessageToString(): string escape sequence %d unknown", chr);
break;
}
num += (_version == 8) ? 4 : 2;
@@ -677,21 +677,21 @@
// Check for a buffer overflow
if (dst >= end)
- error("addMessageToStack: buffer overflow!");
+ error("convertMessageToString: buffer overflow!");
}
*dst = 0;
return dstSize - (end - dst);
}
-int ScummEngine::addIntToStack(byte *dst, int dstSize, int var) {
+int ScummEngine::convertIntMessage(byte *dst, int dstSize, int var) {
int num;
num = readVar(var);
return snprintf((char *)dst, dstSize, "%d", num);
}
-int ScummEngine::addVerbToStack(byte *dst, int dstSize, int var) {
+int ScummEngine::convertVerbMessage(byte *dst, int dstSize, int var) {
int num, k;
num = readVar(var);
@@ -699,7 +699,7 @@
for (k = 1; k < _numVerbs; k++) {
if (num == _verbs[k].verbid && !_verbs[k].type && !_verbs[k].saveid) {
const byte *ptr = getResourceAddress(rtVerb, k);
- return addMessageToStack(ptr, dst, dstSize);
+ return convertMessageToString(ptr, dst, dstSize);
}
}
}
@@ -713,13 +713,13 @@
if (num) {
const byte *ptr = getObjOrActorName(num);
if (ptr) {
- return addMessageToStack(ptr, dst, dstSize);
+ return convertMessageToString(ptr, dst, dstSize);
}
}
return 0;
}
-int ScummEngine::addStringToStack(byte *dst, int dstSize, int var) {
+int ScummEngine::convertStringMessage(byte *dst, int dstSize, int var) {
const byte *ptr;
if (_version <= 2) {
@@ -741,7 +741,7 @@
if (var) {
ptr = getStringAddress(var);
if (ptr) {
- return addMessageToStack(ptr, dst, dstSize);
+ return convertMessageToString(ptr, dst, dstSize);
}
}
return 0;
@@ -777,7 +777,7 @@
BlastText &bt = _blastTextQueue[_blastTextQueuePos++];
assert(_blastTextQueuePos <= ARRAYSIZE(_blastTextQueue));
- addMessageToStack(text, bt.text, sizeof(bt.text));
+ convertMessageToString(text, bt.text, sizeof(bt.text));
bt.xpos = x;
bt.ypos = y;
bt.color = color;
More information about the Scummvm-git-logs
mailing list