[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.44,2.45
Max Horn
fingolfin at users.sourceforge.net
Sun May 4 13:08:50 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv9524
Modified Files:
script_v2.cpp
Log Message:
V2 verbop fix (read verb name from script)
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -d -r2.44 -r2.45
--- script_v2.cpp 4 May 2003 17:39:25 -0000 2.44
+++ script_v2.cpp 4 May 2003 20:07:32 -0000 2.45
@@ -742,26 +742,32 @@
}
void Scumm_v2::o2_verbOps() {
- int opcode = fetchScriptByte(), slot, state;
-
- switch (opcode) {
+ int opcode = fetchScriptByte();
+ int slot, state;
+
+ switch (opcode) {
case 0: // Delete Verb
slot = getVarOrDirectByte(0x80);
- break;
-
+ break;
+
case 0xFF: // Verb On/Off
slot = fetchScriptByte();
state = fetchScriptByte();
- break;
-
+ break;
+
default: { // New Verb
- fetchScriptByte(); // X
- fetchScriptByte(); // Y
- getVarOrDirectByte(0x80); // Slot
- fetchScriptByte(); // ?
+ int x = fetchScriptByte();
+ int y = fetchScriptByte();
+ slot = getVarOrDirectByte(0x80);
+ int unk = fetchScriptByte(); // ?
+
+ // It follows the verb name
+ printf("o2_verbOps: opcode = %d, x = %d, y = %d, slot = %d, unk = %d, name = %s\n",
+ opcode, x, y, slot, unk, _scriptPointer);
+ _scriptPointer += strlen((char *)_scriptPointer) + 1;
+ }
+ break;
}
- break;
- }
}
void Scumm_v2::o2_isEqual() {
More information about the Scummvm-git-logs
mailing list