diff options
| author | Max Horn | 2007-02-02 23:43:39 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-02 23:43:39 +0000 |
| commit | e363d1ebb1b29919b45af724498b8f158ca6d8aa (patch) | |
| tree | ef2ce6b44181b61f645573568014c001ba256e4a /engines/scumm | |
| parent | 6c9502b9016ca301b5029b06fed27c91d9f593e4 (diff) | |
| download | scummvm-rg350-e363d1ebb1b29919b45af724498b8f158ca6d8aa.tar.gz scummvm-rg350-e363d1ebb1b29919b45af724498b8f158ca6d8aa.tar.bz2 scummvm-rg350-e363d1ebb1b29919b45af724498b8f158ca6d8aa.zip | |
Broadened the fix for bug #795214 to make it work with resaves of old savegames, fixing bug #1648248
svn-id: r25340
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/saveload.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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); } |