[Scummvm-cvs-logs] SF.net SVN: scummvm:[38946] scummvm/branches/branch-0-13-0/engines/agos/ subroutine.cpp

[Kirben at users.sourceforge.net]

Revision: 38946
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38946&view=rev
Author:   Kirben
Date:     2009-02-28 00:21:08 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Fix bug #2642654 - SIMON2: Cannot load savegame, also in CD DOS?.

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/agos/subroutine.cpp

Modified: scummvm/branches/branch-0-13-0/engines/agos/subroutine.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/agos/subroutine.cpp	2009-02-28 00:19:14 UTC (rev 38945)
+++ scummvm/branches/branch-0-13-0/engines/agos/subroutine.cpp	2009-02-28 00:21:08 UTC (rev 38946)
@@ -542,9 +542,9 @@
 
 	// WORKAROUND: If the game is saved, right after Simon is thrown in the dungeon of Sordid's Fortress of Doom,
 	// the saved game fails to load correctly. When loading the saved game, the sequence of Simon waking is started,
-	// before the scene is actually reloaded, due to a script bug. We manually add the extra script code from DOS CD
-	// release, which fixed this particular script bug.
-	if (getGameType() == GType_SIMON2 && !(getFeatures() & GF_TALKIE) && sub->id == 12101) {
+	// before the scene is actually reloaded, due to a script bug. We manually add the extra script code from the
+	// updated DOS CD release, which fixed this particular script bug.
+	if (getGameType() == GType_SIMON2 && sub->id == 12101) {
 		const byte bit = 228;
 		if ((_bitArrayTwo[bit / 16] & (1 << (bit & 15))) != 0 && (int)readVariable(34) == -1) {
 			_bitArrayTwo[228 / 16] &= ~(1 << (bit & 15));


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