[Scummvm-cvs-logs] SF.net SVN: scummvm:[47731] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 47731
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47731&view=rev
Author:   thebluegr
Date:     2010-01-31 00:14:23 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
Fixed endless looping in Longbow, when the after market GM patches are used

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

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2010-01-31 00:13:16 UTC (rev 47730)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2010-01-31 00:14:23 UTC (rev 47731)
@@ -290,8 +290,6 @@
 	s->_gameObj = s->_segMan->lookupScriptExport(0, 0);
 	uint32 gameFlags = 0;	// unused
 	s->_gameId = convertSierraGameId(s->_segMan->getObjectName(s->_gameObj), &gameFlags, s->resMan);
-	// Add the after market GM patches for the specified game, if they exist
-	s->resMan->addNewGMPatch(s->_gameId);
 
 	debug(2, " \"%s\" at %04x:%04x", s->_gameId.c_str(), PRINT_REG(s->_gameObj));
 

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-01-31 00:13:16 UTC (rev 47730)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-01-31 00:14:23 UTC (rev 47731)
@@ -186,6 +186,9 @@
 		return Common::kUnknownError;
 	}
 
+	// Add the after market GM patches for the specified game, if they exist
+	_resMan->addNewGMPatch(_gamestate->_gameId);
+
 	script_adjust_opcode_formats(_gamestate);
 	_kernel->loadKernelNames(getGameID(), _gamestate);
 


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