[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.455,1.456

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26937/scumm

Modified Files:
	script_v6.cpp 
Log Message:

COMI delays use minutes too, so remove hack.
Confirmed with COMI disasm.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -d -r1.455 -r1.456
--- script_v6.cpp	20 Oct 2005 14:44:02 -0000	1.455
+++ script_v6.cpp	21 Oct 2005 23:31:23 -0000	1.456
@@ -2293,9 +2293,6 @@
 }
 
 void ScummEngine_v6::o6_delay() {
-	// FIXME - what exactly are we measuring here? In order for the other two
-	// delay functions to be right, it should be 1/60th of a second. But for
-	// CMI it would seem this should delay for 1/10th of a second...
 	uint32 delay = (uint16)pop();
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = ssPaused;
@@ -2304,21 +2301,13 @@
 
 void ScummEngine_v6::o6_delaySeconds() {
 	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;
-
+	delay = delay * 60;
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = ssPaused;
 	o6_breakHere();
 }
 
 void ScummEngine_v6::o6_delayMinutes() {
-	// FIXME - are we really measuring minutes here?
 	uint32 delay = (uint16)pop() * 3600;
 	vm.slot[_currentScript].delay = delay;
 	vm.slot[_currentScript].status = ssPaused;