diff options
| author | Tobias Gunkel | 2012-01-22 00:01:53 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:29:07 +0100 |
| commit | 124e8926ba3d81c03f7603ebb6f5b2ed8d949831 (patch) | |
| tree | 65c7c44d34a912fa253f97c7d6f02299bad4cc49 | |
| parent | f22bbc47b460bf7901844649e1e7929f512b9670 (diff) | |
| download | scummvm-rg350-124e8926ba3d81c03f7603ebb6f5b2ed8d949831.tar.gz scummvm-rg350-124e8926ba3d81c03f7603ebb6f5b2ed8d949831.tar.bz2 scummvm-rg350-124e8926ba3d81c03f7603ebb6f5b2ed8d949831.zip | |
SCUMM: do not convert a savegame twice
| -rw-r--r-- | engines/scumm/saveload.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 6c6c4a1a27..a1b2fafa86 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1212,7 +1212,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { _objs[i].obj_nr = 0; } else if (_game.version == 0) { // TODO: handle this correctly for (i = 0; i < _numLocalObjects; i++) { - if (_objs[i].obj_nr != 0 && _objs[i].flags != 0) + if (_objs[i].obj_nr != 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == 0 && _objs[i].flags != 0) _objs[i].obj_nr = OBJECT_V0(_objs[i].obj_nr, _objs[i].flags); } } |