[Scummvm-cvs-logs] SF.net SVN: scummvm: [23259] scummvm/trunk/engines/scumm/scumm.cpp

[kirben at users.sourceforge.net]

Revision: 23259
Author:   kirben
Date:     2006-06-22 06:04:19 -0700 (Thu, 22 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23259&view=rev

Log Message:
-----------
Fix bug #1509496 - INDY3 (MAC): Map screen hangs up at azores.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-06-22 08:21:28 UTC (rev 23258)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-06-22 13:04:19 UTC (rev 23259)
@@ -1606,12 +1606,13 @@
 		((ScummEngine_v90he *)this)->_logicHE->startOfFrame();
 	}
 #endif
-	if (_game.version > 2) {
+	if (_game.version >= 3) {
 		VAR(VAR_TMR_1) += delta;
 		VAR(VAR_TMR_2) += delta;
 		VAR(VAR_TMR_3) += delta;
-		if (_game.id == GID_ZAK || _game.id == GID_INDY3) {
-			// All versions of Indy3 set three extra timers
+		if ((_game.id == GID_INDY3 && _game.platform != Common::kPlatformMacintosh) ||
+			_game.id == GID_ZAK) {
+			// Amiga/PC versions of Indy3 set three extra timers
 			// FM-TOWNS version of Zak sets three extra timers
 			VAR(39) += delta;
 			VAR(40) += delta;


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