[Scummvm-cvs-logs] SF.net SVN: scummvm: [32962] scummvm/trunk/engines/gob/inter.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Tue Jul 8 13:35:09 CEST 2008


Revision: 32962
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32962&view=rev
Author:   drmccoy
Date:     2008-07-08 04:35:09 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
Modified the EGA story image delay to work for the Mac versions as well

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter.cpp

Modified: scummvm/trunk/engines/gob/inter.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter.cpp	2008-07-08 11:18:44 UTC (rev 32961)
+++ scummvm/trunk/engines/gob/inter.cpp	2008-07-08 11:35:09 UTC (rev 32962)
@@ -212,25 +212,35 @@
 			break;
 
 		// WORKAROUND:
-		// The EGA version of gob1 doesn't add a delay after showing
+		// The EGA and Mac versions of gob1 doesn't add a delay after showing
 		// images between levels. We manually add it here.
-		if ((_vm->getGameType() == kGameTypeGob1) && _vm->isEGA()) {
+		if ((_vm->getGameType() == kGameTypeGob1) &&
+		   (_vm->isEGA() || (_vm->getPlatform() == Common::kPlatformMacintosh))) {
+
 			int addr = _vm->_global->_inter_execPtr-_vm->_game->_totFileData;
-			if ((startaddr == 0x18B4 && addr == 0x1A7F && // Zombie
+
+			if ((startaddr == 0x18B4 && addr == 0x1A7F && // Zombie, EGA
 				 !strncmp(_vm->_game->_curTotFile, "avt005.tot", 10)) ||
+			  (startaddr == 0x188D && addr == 0x1A58 && // Zombie, Mac
+				 !strncmp(_vm->_game->_curTotFile, "avt005.tot", 10)) ||
 				(startaddr == 0x1299 && addr == 0x139A && // Dungeon
 				 !strncmp(_vm->_game->_curTotFile, "avt006.tot", 10)) ||
-				(startaddr == 0x11C0 && addr == 0x12C9 && // Cauldron
+				(startaddr == 0x11C0 && addr == 0x12C9 && // Cauldron, EGA
 				 !strncmp(_vm->_game->_curTotFile, "avt012.tot", 10)) ||
+				(startaddr == 0x11C8 && addr == 0x1341 && // Cauldron, Mac
+				 !strncmp(_vm->_game->_curTotFile, "avt012.tot", 10)) ||
 				(startaddr == 0x09F2 && addr == 0x0AF3 && // Statue
 				 !strncmp(_vm->_game->_curTotFile, "avt016.tot", 10)) ||
 				(startaddr == 0x0B92 && addr == 0x0C93 && // Castle
 				 !strncmp(_vm->_game->_curTotFile, "avt019.tot", 10)) ||
-				(startaddr == 0x17D9 && addr == 0x18DA && // Finale
+				(startaddr == 0x17D9 && addr == 0x18DA && // Finale, EGA
+				 !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10)) ||
+				(startaddr == 0x17E9 && addr == 0x19A8 && // Finale, Mac
 				 !strncmp(_vm->_game->_curTotFile, "avt022.tot", 10))) {
 
 				_vm->_util->longDelay(5000);
 			}
+
 		} // End of workaround
 
 		cmd = *_vm->_global->_inter_execPtr;


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