[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.70,2.71 script_v2.cpp,2.33,2.34

[James Brown]

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

Modified Files:
	intern.h script_v2.cpp 
Log Message:
hack around v2 o2_delay problem


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.70
retrieving revision 2.71
diff -u -d -r2.70 -r2.71
--- intern.h	30 Apr 2003 11:15:07 -0000	2.70
+++ intern.h	3 May 2003 15:08:09 -0000	2.71
@@ -270,6 +270,7 @@
 	void o2_getActorWalkBox();
 	void o2_endCutscene();
 	void o2_drawSentence();
+	void o2_delay();
 };
 
 class Scumm_v4 : public Scumm_v3 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.33
retrieving revision 2.34
diff -u -d -r2.33 -r2.34
--- script_v2.cpp	3 May 2003 06:49:49 -0000	2.33
+++ script_v2.cpp	3 May 2003 15:08:10 -0000	2.34
@@ -90,7 +90,7 @@
 		/* 2C */
 		OPCODE(o2_assignVarByte),
 		OPCODE(o5_putActorInRoom),
-		OPCODE(o5_delay),
+		OPCODE(o2_delay),
 		OPCODE(o2_ifNotState04),
 		/* 30 */
 		OPCODE(o2_matrixOps),
@@ -1150,3 +1150,16 @@
 void Scumm_v2::o2_drawSentence() {
 	warning("TODO o2_drawSentence()");
 }
+
+void Scumm_v2::o2_delay() {
+	int delay = fetchScriptByte();
+	delay |= fetchScriptByte() << 8;
+	delay |= fetchScriptByte() << 16;
+
+	vm.slot[_currentScript].delay = 1;	// FIXME: Fix conversion
+	vm.slot[_currentScript].status = 1;
+	o5_breakHere();
+
+	warning("TODO: o2_delay(%d)", delay);
+}
+