[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.39,1.40

[James Brown]

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

Modified Files:
	script_v6.cpp 
Log Message:
ComI timing hack... very odd.



Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- script_v6.cpp	12 Jan 2003 21:13:21 -0000	1.39
+++ script_v6.cpp	14 Jan 2003 10:33:18 -0000	1.40
@@ -2236,8 +2236,15 @@
 
 void Scumm_v6::o6_delaySeconds()
 {
-	// FIXME - are we really measuring minutes here?
-	uint32 delay = (uint16)pop() * 60;
+	uint32 delay = (uint32)pop();
+	if (_gameId != GID_CMI)
+		// FIXME - are we really measuring minutes here?
+		delay = delay * 60;
+	else
+		// FIXME - Is this the same in ComI? Seem to need a 1.5 minute 
+		// multiplier for correct timing - see patch 664893
+		delay = delay * 90;
+
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = 1;
 	o6_breakHere();