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

tdhs at users.sourceforge.net tdhs at users.sourceforge.net
Thu Nov 4 07:28:51 CET 2010


Revision: 54061
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54061&view=rev
Author:   tdhs
Date:     2010-11-04 06:28:51 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
GOB: Extended workaround for Goblin Stuck On Reload to cover bug #3065914

This generalises the workaround added for bug #3018918 i.e. UOTODDV issue, to cover the
ICVGCGT case and hopefully all future cases, by executing the variable correction during
the reload after Game Over and using the variable read by the script triggering the movement lock, rather than the movement lock variable (59) itself as this may not be set until a later script.

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

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2010-11-04 06:28:34 UTC (rev 54060)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2010-11-04 06:28:51 UTC (rev 54061)
@@ -812,12 +812,12 @@
 	byte cmd;
 	bool boolRes;
 
-	// WORKAROUND: Windows Gob1 OUTODDV reload goblin stuck bug present in original
-	if ((_vm->getGameType() == kGameTypeGob1) && (_vm->_game->_script->pos() == 11294) &&
-			!scumm_stricmp(_vm->_game->_curTotFile, "avt00.tot") && VAR(59) == 1) {
-		warning("Workaround for Win Gob1 OUTODDV Reload Goblin Stuck Bug...");
+	// WORKAROUND: Gob1 goblin stuck on reload bugs present in original - bugs #3018918 and 3065914
+	if ((_vm->getGameType() == kGameTypeGob1) && (_vm->_game->_script->pos() == 2933) &&
+			!scumm_stricmp(_vm->_game->_curTotFile, "inter.tot") && VAR(285) != 0) {
+		warning("Workaround for Gob1 Goblin Stuck On Reload Bug applied...");
+		// VAR(59) actually locks goblin movement, but these variables trigger this in the script.
 		WRITE_VAR(285, 0);
-		WRITE_VAR(59, 0);
 	}
 
 	boolRes = _vm->_game->_script->evalBoolResult();


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