[Scummvm-cvs-logs] SF.net SVN: scummvm:[54391] scummvm/trunk/engines/sci/engine/kmisc.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sat Nov 20 01:52:06 CET 2010


Revision: 54391
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54391&view=rev
Author:   thebluegr
Date:     2010-11-20 00:52:05 +0000 (Sat, 20 Nov 2010)

Log Message:
-----------
SCI: Fixed timer bug #3109139 - "SQ4: Crash after exiting Skate-o-Rama during chase"

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kmisc.cpp

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2010-11-20 00:20:05 UTC (rev 54390)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2010-11-20 00:52:05 UTC (rev 54391)
@@ -75,6 +75,17 @@
 			neededSleep = 60;
 		}
 		break;
+	case GID_SQ4:
+		// In SQ4 (floppy and CD) the sequel police appear way too quickly in 
+		// the Skate-o-rama rooms, resulting in all sorts of timer issues, like
+		// #3109139 (which occurs because a police officer instantly teleports
+		// just before Roger exits and shoots him). We throttle these scenes a
+		// bit more, in order to prevent timer bugs related to the sequel police 
+		if (s->currentRoomNumber() == 405 || s->currentRoomNumber() == 406 ||
+			s->currentRoomNumber() == 410 || s->currentRoomNumber() == 411) {
+			s->_throttleTrigger = true;
+			neededSleep = 60;
+		}
 	default:
 		break;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list