[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.36,2.37

[Max Horn]

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

Modified Files:
	script_v2.cpp 
Log Message:
fixed o2_delay

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -d -r2.36 -r2.37
--- script_v2.cpp	4 May 2003 00:29:52 -0000	2.36
+++ script_v2.cpp	4 May 2003 00:41:52 -0000	2.37
@@ -1041,6 +1041,17 @@
 	o5_breakHere();
 }
 
+void Scumm_v2::o2_delay() {
+	int delay = fetchScriptByte();
+	delay |= fetchScriptByte() << 8;
+	delay |= fetchScriptByte() << 16;
+	delay = 0xFFFFFF - delay;
+
+	vm.slot[_currentScript].delay = delay;
+	vm.slot[_currentScript].status = 1;
+	o5_breakHere();
+}
+
 void Scumm_v2::o2_matrixOps() {
 	int a, b;
 
@@ -1172,18 +1183,6 @@
 
 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);
 }
 
 void Scumm_v2::o2_dummy() {