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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Feb 3 00:43:40 CET 2007


Revision: 25340
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25340&view=rev
Author:   fingolfin
Date:     2007-02-02 15:43:39 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
Broadened the fix for bug #795214 to make it work with resaves of old savegames, fixing bug #1648248

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/saveload.cpp

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2007-02-02 19:55:41 UTC (rev 25339)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2007-02-02 23:43:39 UTC (rev 25340)
@@ -276,9 +276,11 @@
 	if (_screenTop < 0)
 		_screenTop = 0;
 
-	// WORKAROUND bug #795214: Object 819 could be set to a state of 1 in old save games
-	// Object 819 is part of the exit of the church and should not be drawn.
-	if (hdr.ver < VER(59) && _game.id == GID_MONKEY_VGA) {
+	// WORKAROUND bug #795214: For unknown reasons, object 819 sometimes is in
+	// state 1 in old save games, implying it should be drawn. This in turn
+	// results in a crash when entering the church, as object 819 is part of the
+	//  exitof the church and there are no graphics assigned to it.
+	if (_game.id == GID_MONKEY_VGA) {
 		putState(819, 0);
 	}
 


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