[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.137,2.138 script_v6he.cpp,2.13,2.14
Travis Howell
kirben at users.sourceforge.net
Tue Feb 10 19:41:02 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5546/scumm
Modified Files:
intern.h script_v6he.cpp
Log Message:
Rename as requested.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.137
retrieving revision 2.138
diff -u -d -r2.137 -r2.138
--- intern.h 11 Feb 2004 03:21:50 -0000 2.137
+++ intern.h 11 Feb 2004 03:36:27 -0000 2.138
@@ -558,7 +558,7 @@
virtual void decodeParseString(int a, int b);
- void unknownEA_func(int arrayId, int newX, int newY, int d);
+ void redimArray(int arrayId, int newX, int newY, int d);
int readFileToArray(int slot, int32 size);
void writeFileFromArray(int slot, int resID);
@@ -587,7 +587,7 @@
void o6_localizeArray();
void o6_unknownEE();
void o6_unknownFA();
- void o6_unknownEA();
+ void o6_redimArray();
void o6_readINI();
void o6_unknownF9();
};
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- script_v6he.cpp 11 Feb 2004 03:21:50 -0000 2.13
+++ script_v6he.cpp 11 Feb 2004 03:36:27 -0000 2.14
@@ -339,7 +339,7 @@
/* E8 */
OPCODE(o6_invalid),
OPCODE(o6_seekFile),
- OPCODE(o6_unknownEA),
+ OPCODE(o6_redimArray),
OPCODE(o6_invalid),
/* EC */
OPCODE(o6_invalid),
@@ -1110,7 +1110,7 @@
warning("stub o6_seekFile(%d, %d, %d)", a, b, c);
}
-void ScummEngine_v6he::o6_unknownEA() {
+void ScummEngine_v6he::o6_redimArray() {
int edi, esi, eax;
edi = pop();
esi = pop();
@@ -1124,27 +1124,27 @@
eax = fetchScriptByte();
switch (eax) {
case 199:
- unknownEA_func(fetchScriptWord(), esi, edi, 5);
+ redimArray(fetchScriptWord(), esi, edi, 5);
break;
case 202:
- unknownEA_func(fetchScriptWord(), esi, edi, 3);
+ redimArray(fetchScriptWord(), esi, edi, 3);
break;
default:
break;
}
}
-void ScummEngine_v6he::unknownEA_func(int arrayId, int newX, int newY, int d) {
+void ScummEngine_v6he::redimArray(int arrayId, int newX, int newY, int d) {
// Used in mini game at Cosmic Dust Diner in puttmoon
int var_2, var_4, ax, cx;
if (readVar(arrayId) == 0)
- error("unknownEA_func: Reference to zeroed array pointer");
+ error("redimArray: Reference to zeroed array pointer");
byte *ptr = getResourceAddress(rtString, readVar(arrayId));
if (!ptr)
- error("unknownEA_func: Invalid array (%d) reference", readVar(arrayId));
+ error("redimArray: Invalid array (%d) reference", readVar(arrayId));
if (d == 5)
var_2 = 2;
@@ -1160,7 +1160,7 @@
ax = var_4 * READ_LE_UINT16(ptr + 2) * READ_LE_UINT16(ptr + 4);
if (ax == cx)
- error("unknownEA_func: array %d redim mismatch", readVar(arrayId));
+ error("redimArray: array %d redim mismatch", readVar(arrayId));
WRITE_LE_UINT16(ptr, d);
WRITE_LE_UINT16(ptr + 2, newX + 1);
More information about the Scummvm-git-logs
mailing list