From e363d1ebb1b29919b45af724498b8f158ca6d8aa Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 2 Feb 2007 23:43:39 +0000
Subject: Broadened the fix for bug #795214 to make it work with resaves of old
 savegames, fixing bug #1648248

svn-id: r25340
---
 engines/scumm/saveload.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index ca513e25d8..684d6972e4 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -276,9 +276,11 @@ bool ScummEngine::loadState(int slot, bool compat) {
 	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);
 	}
 
-- 
cgit v1.2.3