[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.300,2.301 script_v100he.cpp,2.9,2.10 script_v72he.cpp,2.162,2.163
Travis Howell
kirben at users.sourceforge.net
Sat Oct 9 21:12:23 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11187/scumm
Modified Files:
intern.h script_v100he.cpp script_v72he.cpp
Log Message:
More HE100 corrections.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.300
retrieving revision 2.301
diff -u -d -r2.300 -r2.301
--- intern.h 10 Oct 2004 01:52:35 -0000 2.300
+++ intern.h 10 Oct 2004 04:02:37 -0000 2.301
@@ -934,6 +934,7 @@
void o100_wizImageOps();
void o100_dim2dim2Array();
void o100_paletteOps();
+ void o100_redimArray();
void o100_roomOps();
void o100_startSound();
void o100_unknown26();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- script_v100he.cpp 10 Oct 2004 03:33:48 -0000 2.9
+++ script_v100he.cpp 10 Oct 2004 04:02:37 -0000 2.10
@@ -169,7 +169,7 @@
OPCODE(o6_putActorAtXY),
OPCODE(o6_invalid),
/* 64 */
- OPCODE(o72_redimArray),
+ OPCODE(o100_redimArray),
OPCODE(o60_rename),
OPCODE(o6_stopObjectCode),
OPCODE(o6_invalid),
@@ -224,7 +224,7 @@
OPCODE(o6_walkActorToObj),
OPCODE(o6_walkActorTo),
/* 90 */
- OPCODE(o60_writeFile),
+ OPCODE(o72_writeFile),
OPCODE(o72_writeINI),
OPCODE(o80_writeConfigFile),
OPCODE(o6_abs),
@@ -306,8 +306,8 @@
/* D0 */
OPCODE(o6_getRandomNumber),
OPCODE(o6_getRandomNumberRange),
- OPCODE(o60_readFile),
OPCODE(o6_invalid),
+ OPCODE(o72_readFile),
/* D4 */
OPCODE(o72_readINI),
OPCODE(o80_readConfigFile),
@@ -596,8 +596,6 @@
ah = defineArray(array, kStringArray, 0, 0, 0, len);
memcpy(ah->data, string, len);
break;
-
-
case 77: // SO_ASSIGN_STRING
copyScriptString(string);
len = resStrLen(string) + 1;
@@ -626,7 +624,6 @@
writeArray(array, 0, b + c, pop());
}
break;
-
case 130:
len = getStackList(list, ARRAYSIZE(list));
dim1end = pop();
@@ -1105,6 +1102,27 @@
debug(0,"o100_paletteOps stub (%d)", subOp);
}
+void ScummEngine_v100he::o100_redimArray() {
+ int newX, newY;
+ newY = pop();
+ newX = pop();
+
+ byte subOp = fetchScriptByte();
+ switch (subOp) {
+ case 42:
+ redimArray(fetchScriptWord(), 0, newX, 0, newY, kIntArray);
+ break;
+ case 43:
+ redimArray(fetchScriptWord(), 0, newX, 0, newY, kDwordArray);
+ break;
+ case 45:
+ redimArray(fetchScriptWord(), 0, newX, 0, newY, kByteArray);
+ break;
+ default:
+ error("o100_redimArray: default type %d", subOp);
+ }
+}
+
void ScummEngine_v100he::o100_roomOps() {
int a, b, c, d, e;
byte op;
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.162
retrieving revision 2.163
diff -u -d -r2.162 -r2.163
--- script_v72he.cpp 10 Oct 2004 01:52:35 -0000 2.162
+++ script_v72he.cpp 10 Oct 2004 04:02:37 -0000 2.163
@@ -2104,9 +2104,11 @@
}
switch (subOp) {
+ case 9: // HE 100
case 218:
area = *vs->getBackPixels(x, y - vs->topline);
break;
+ case 8: // HE 100
case 219:
area = *vs->getPixels(x, y - vs->topline);
break;
More information about the Scummvm-git-logs
mailing list