thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename as requested.

Browse source 
svn-id: r12820
This commit is contained in:
Travis Howell 2004-02-11 03:36:27 +00:00
parent 76fc86f028
commit e451c498ac
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/intern.h
View file

@ -558,7 +558,7 @@ protected:
virtual void decodeParseString(int a, int b); 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); int readFileToArray(int slot, int32 size);
void writeFileFromArray(int slot, int resID); void writeFileFromArray(int slot, int resID);
@ -587,7 +587,7 @@ protected:
void o6_localizeArray(); void o6_localizeArray();
void o6_unknownEE(); void o6_unknownEE();
void o6_unknownFA(); void o6_unknownFA();
void o6_unknownEA(); void o6_redimArray();
void o6_readINI(); void o6_readINI();
void o6_unknownF9(); void o6_unknownF9();
}; };

16
scumm/script_v6he.cpp
View file

@ -339,7 +339,7 @@ void ScummEngine_v6he::setupOpcodes() {
/* E8 */ /* E8 */
OPCODE(o6_invalid), OPCODE(o6_invalid),
OPCODE(o6_seekFile), OPCODE(o6_seekFile),
OPCODE(o6_unknownEA), OPCODE(o6_redimArray),
OPCODE(o6_invalid), OPCODE(o6_invalid),
/* EC */ /* EC */
OPCODE(o6_invalid), OPCODE(o6_invalid),
@ -1110,7 +1110,7 @@ void ScummEngine_v6he::o6_seekFile() {
warning("stub o6_seekFile(%d, %d, %d)", a, b, c); warning("stub o6_seekFile(%d, %d, %d)", a, b, c);
} }
void ScummEngine_v6he::o6_unknownEA() { void ScummEngine_v6he::o6_redimArray() {
int edi, esi, eax; int edi, esi, eax;
edi = pop(); edi = pop();
esi = pop(); esi = pop();
@ -1124,27 +1124,27 @@ void ScummEngine_v6he::o6_unknownEA() {
eax = fetchScriptByte(); eax = fetchScriptByte();
switch (eax) { switch (eax) {
case 199: case 199:
unknownEA_func(fetchScriptWord(), esi, edi, 5); redimArray(fetchScriptWord(), esi, edi, 5);
break; break;
case 202: case 202:
unknownEA_func(fetchScriptWord(), esi, edi, 3); redimArray(fetchScriptWord(), esi, edi, 3);
break; break;
default: default:
break; 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 // Used in mini game at Cosmic Dust Diner in puttmoon
int var_2, var_4, ax, cx; int var_2, var_4, ax, cx;
if (readVar(arrayId) == 0) 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)); byte *ptr = getResourceAddress(rtString, readVar(arrayId));
if (!ptr) if (!ptr)
error("unknownEA_func: Invalid array (%d) reference", readVar(arrayId)); error("redimArray: Invalid array (%d) reference", readVar(arrayId));
if (d == 5) if (d == 5)
var_2 = 2; var_2 = 2;
@ -1160,7 +1160,7 @@ void ScummEngine_v6he::unknownEA_func(int arrayId, int newX, int newY, int d) {
ax = var_4 * READ_LE_UINT16(ptr + 2) * READ_LE_UINT16(ptr + 4); ax = var_4 * READ_LE_UINT16(ptr + 2) * READ_LE_UINT16(ptr + 4);
if (ax == cx) 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, d);
WRITE_LE_UINT16(ptr + 2, newX + 1); WRITE_LE_UINT16(ptr + 2, newX + 1);