[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.60,2.61 script_v2.cpp,2.18,2.19

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24360/scumm

Modified Files:
	intern.h script_v2.cpp 
Log Message:
Some more V2 fixes for Zak


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -d -r2.60 -r2.61
--- intern.h	21 Apr 2003 15:42:55 -0000	2.60
+++ intern.h	23 Apr 2003 05:13:26 -0000	2.61
@@ -251,7 +251,7 @@
 	void o2_isNotEqual();
 	void o2_equalZero();
 	void o2_notEqualZero();
-
+	void o2_startScript();
 };
 
 class Scumm_v4 : public Scumm_v3 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- script_v2.cpp	21 Apr 2003 15:42:55 -0000	2.18
+++ script_v2.cpp	23 Apr 2003 05:13:26 -0000	2.19
@@ -115,7 +115,7 @@
 		/* 40 */
 		OPCODE(o5_cutscene),
 		OPCODE(o2_putActor),
-		OPCODE(o5_startScript),
+		OPCODE(o2_startScript),
 		OPCODE(o5_getActorX),
 		/* 44 */
 		OPCODE(o2_isLess),
@@ -143,7 +143,7 @@
 		OPCODE(o5_getActorMoving),
 		OPCODE(o2_setState02),
 		/* 58 */
-		OPCODE(o5_overRide),
+		OPCODE(beginOverride),
 		OPCODE(o5_doSentence),
 		OPCODE(o5_add),
 		OPCODE(o2_setBitVar),
@@ -191,7 +191,7 @@
 		OPCODE(o5_isSoundRunning),
 		OPCODE(o5_getActorElevation),
 		OPCODE(o2_walkActorTo),
-		OPCODE(o5_drawBox),
+		OPCODE(o2_ifNotState01),
 		/* 80 */
 		OPCODE(o5_breakHere),
 		OPCODE(o2_putActor),
@@ -275,7 +275,7 @@
 		/* C0 */
 		OPCODE(o5_endCutscene),
 		OPCODE(o2_putActor),
-		OPCODE(o5_startScript),
+		OPCODE(o2_startScript),
 		OPCODE(o5_getActorX),
 		/* C4 */
 		OPCODE(o2_isLess),
@@ -903,4 +903,9 @@
 	y = getVarOrDirectByte(0x20);
 
 	a->putActor(x, y, a->room);
+}
+
+void Scumm_v2::o2_startScript() {
+	int script = getVarOrDirectByte(0x80);
+	runScript(script, 0, 0, 0);	// FIXME: Need to confirm runScript parameters/mode
 }