[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.301,2.302 script_v100he.cpp,2.11,2.12 script_v6he.cpp,2.132,2.133 script_v72he.cpp,2.163,2.164 script_v7he.cpp,2.104,2.105 script_v80he.cpp,2.55,2.56 script_v90he.cpp,2.90,2.91
Travis Howell
kirben at users.sourceforge.net
Sat Oct 9 22:53:29 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27348/scumm
Modified Files:
intern.h script_v100he.cpp script_v6he.cpp script_v72he.cpp
script_v7he.cpp script_v80he.cpp script_v90he.cpp
Log Message:
Rename opcodes
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.301
retrieving revision 2.302
diff -u -d -r2.301 -r2.302
--- intern.h 10 Oct 2004 04:02:37 -0000 2.301
+++ intern.h 10 Oct 2004 05:49:30 -0000 2.302
@@ -593,7 +593,7 @@
void o60_writeFile();
void o60_soundOps();
void o60_seekFilePos();
- void o60_localizeArray();
+ void o60_localizeArrayToScript();
void o60_redimArray();
void o60_readFilePos();
};
@@ -805,7 +805,7 @@
void o80_unknown45();
void o80_unknown48();
void o80_unknown49();
- void o80_unknown4A();
+ void o80_localizeArrayToRoom();
void o80_readConfigFile();
void o80_writeConfigFile();
void o80_cursorCommand();
@@ -878,7 +878,8 @@
void o90_sqrt();
void o90_atan2();
void o90_getSegmentAngle();
- void o90_startLocalScript();
+ void o90_startScriptUnk();
+ void o90_jumpToScriptUnk();
void o90_wizImageOps();
void o90_unknown25();
void o90_unknown26();
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- script_v100he.cpp 10 Oct 2004 05:16:12 -0000 2.11
+++ script_v100he.cpp 10 Oct 2004 05:49:30 -0000 2.12
@@ -122,7 +122,7 @@
OPCODE(o70_kernelSetFunctions),
OPCODE(o6_land),
OPCODE(o6_le),
- OPCODE(o60_localizeArray),
+ OPCODE(o60_localizeArrayToScript),
/* 40 */
OPCODE(o6_wordArrayRead),
OPCODE(o6_wordArrayIndexedRead),
@@ -155,9 +155,9 @@
OPCODE(o6_printSystem),
/* 58 */
OPCODE(o6_printCursor),
- OPCODE(o6_invalid),
- OPCODE(o6_invalid),
- OPCODE(o6_invalid),
+ OPCODE(o90_jumpToScriptUnk),
+ OPCODE(o90_startScriptUnk),
+ OPCODE(o6_pseudoRoom),
/* 5C */
OPCODE(o6_pushByte),
OPCODE(o72_pushDWord),
@@ -172,7 +172,7 @@
OPCODE(o100_redimArray),
OPCODE(o60_rename),
OPCODE(o6_stopObjectCode),
- OPCODE(o6_invalid),
+ OPCODE(o80_localizeArrayToRoom),
/* 68 */
OPCODE(o100_roomOps),
OPCODE(o6_printActor),
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.132
retrieving revision 2.133
diff -u -d -r2.132 -r2.133
--- script_v6he.cpp 10 Oct 2004 01:52:35 -0000 2.132
+++ script_v6he.cpp 10 Oct 2004 05:49:30 -0000 2.133
@@ -350,7 +350,7 @@
/* E0 */
OPCODE(o60_soundOps),
OPCODE(o6_getPixel),
- OPCODE(o60_localizeArray),
+ OPCODE(o60_localizeArrayToScript),
OPCODE(o6_pickVarRandom),
/* E4 */
OPCODE(o6_setBoxSet),
@@ -1174,12 +1174,12 @@
void ScummEngine_v60he::localizeArray(int slot, byte script) {
if (slot >= _numArray)
- error("o60_localizeArray(%d): array slot out of range", slot);
+ error("o60_localizeArrayToScript(%d): array slot out of range", slot);
_arraySlot[slot] = script;
}
-void ScummEngine_v60he::o60_localizeArray() {
+void ScummEngine_v60he::o60_localizeArrayToScript() {
int slot = pop();
localizeArray(slot, vm.slot[_currentScript].number);
}
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.163
retrieving revision 2.164
diff -u -d -r2.163 -r2.164
--- script_v72he.cpp 10 Oct 2004 04:02:37 -0000 2.163
+++ script_v72he.cpp 10 Oct 2004 05:49:30 -0000 2.164
@@ -327,7 +327,7 @@
/* E0 */
OPCODE(o60_soundOps),
OPCODE(o72_getPixel),
- OPCODE(o60_localizeArray),
+ OPCODE(o60_localizeArrayToScript),
OPCODE(o72_pickVarRandom),
/* E4 */
OPCODE(o6_setBoxSet),
@@ -825,19 +825,20 @@
void ScummEngine_v72he::o72_startScript() {
int args[16];
- int script, flags;
+ int script;
+ byte flags;
getStackList(args, ARRAYSIZE(args));
script = pop();
flags = fetchScriptByte();
-
runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
}
void ScummEngine_v72he::o72_startObject() {
int args[16];
int script, entryp;
- int flags;
+ byte flags;
+
getStackList(args, ARRAYSIZE(args));
entryp = pop();
script = pop();
@@ -1911,7 +1912,8 @@
void ScummEngine_v72he::o72_jumpToScript() {
int args[16];
- int script, flags;
+ int script;
+ byte flags;
getStackList(args, ARRAYSIZE(args));
script = pop();
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- script_v7he.cpp 10 Oct 2004 01:52:35 -0000 2.104
+++ script_v7he.cpp 10 Oct 2004 05:49:30 -0000 2.105
@@ -328,7 +328,7 @@
/* E0 */
OPCODE(o60_soundOps),
OPCODE(o6_getPixel),
- OPCODE(o60_localizeArray),
+ OPCODE(o60_localizeArrayToScript),
OPCODE(o6_pickVarRandom),
/* E4 */
OPCODE(o6_setBoxSet),
Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -d -r2.55 -r2.56
--- script_v80he.cpp 10 Oct 2004 01:52:35 -0000 2.55
+++ script_v80he.cpp 10 Oct 2004 05:49:30 -0000 2.56
@@ -136,7 +136,7 @@
/* 48 */
OPCODE(o80_unknown48),
OPCODE(o80_unknown49),
- OPCODE(o80_unknown4A),
+ OPCODE(o80_localizeArrayToRoom),
OPCODE(o6_wordArrayIndexedWrite),
/* 4C */
OPCODE(o6_invalid),
@@ -326,7 +326,7 @@
/* E0 */
OPCODE(o80_unknownE0),
OPCODE(o72_getPixel),
- OPCODE(o60_localizeArray),
+ OPCODE(o60_localizeArrayToScript),
OPCODE(o80_pickVarRandom),
/* E4 */
OPCODE(o6_setBoxSet),
@@ -438,7 +438,7 @@
debug(1,"o80_unknown49 stub (%d, %d)", subOp, snd);
}
-void ScummEngine_v80he::o80_unknown4A() {
+void ScummEngine_v80he::o80_localizeArrayToRoom() {
int slot = pop();
localizeArray(slot, 0xFFFFFFFF);
}
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -d -r2.90 -r2.91
--- script_v90he.cpp 10 Oct 2004 00:24:15 -0000 2.90
+++ script_v90he.cpp 10 Oct 2004 05:49:30 -0000 2.91
@@ -97,9 +97,9 @@
OPCODE(o90_unknown28),
OPCODE(o90_unknown29),
OPCODE(o6_invalid),
- OPCODE(o90_startLocalScript),
+ OPCODE(o90_startScriptUnk),
/* 2C */
- OPCODE(o6_invalid),
+ OPCODE(o90_jumpToScriptUnk),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o90_unknown2F),
@@ -136,7 +136,7 @@
/* 48 */
OPCODE(o80_unknown48),
OPCODE(o80_unknown49),
- OPCODE(o80_unknown4A),
+ OPCODE(o80_localizeArrayToRoom),
OPCODE(o6_wordArrayIndexedWrite),
/* 4C */
OPCODE(o6_invalid),
@@ -326,7 +326,7 @@
/* E0 */
OPCODE(o80_unknownE0),
OPCODE(o72_getPixel),
- OPCODE(o60_localizeArray),
+ OPCODE(o60_localizeArrayToScript),
OPCODE(o80_pickVarRandom),
/* E4 */
OPCODE(o6_setBoxSet),
@@ -451,17 +451,31 @@
push(a);
}
-void ScummEngine_v90he::o90_startLocalScript() {
+void ScummEngine_v90he::o90_startScriptUnk() {
int args[16];
- int script, entryp;
- int flags;
+ int script, cycle;
+ byte flags;
+
getStackList(args, ARRAYSIZE(args));
- entryp = pop();
+ cycle = pop();
script = pop();
flags = fetchScriptByte();
runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
}
+void ScummEngine_v90he::o90_jumpToScriptUnk() {
+ int args[16];
+ int script, cycle;
+ byte flags;
+
+ getStackList(args, ARRAYSIZE(args));
+ cycle = pop();
+ script = pop();
+ flags = fetchScriptByte();
+ stopObjectCode();
+ runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
+}
+
void ScummEngine_v90he::drawWizComplexPolygon(int resnum, int state, int po_x, int po_y, int arg14, int angle, int zoom, const Common::Rect *r) {
Common::Point pts[4];
uint32 w, h;
More information about the Scummvm-git-logs
mailing list