diff options
author | Paul Gilbert | 2014-01-19 22:46:33 -0500 |
---|---|---|
committer | Paul Gilbert | 2014-01-19 22:46:33 -0500 |
commit | 758e35e79bf1c2a70bc0b17b06573e5a776285a2 (patch) | |
tree | a28e388c175d0e45a65514ae23d0acfd91fa22c3 /engines/voyeur | |
parent | f49a0e3a06822a0cc77d73f3cbd62de86dddca2d (diff) | |
download | scummvm-rg350-758e35e79bf1c2a70bc0b17b06573e5a776285a2.tar.gz scummvm-rg350-758e35e79bf1c2a70bc0b17b06573e5a776285a2.tar.bz2 scummvm-rg350-758e35e79bf1c2a70bc0b17b06573e5a776285a2.zip |
VOYEUR: Further savegame loading fixes
Diffstat (limited to 'engines/voyeur')
-rw-r--r-- | engines/voyeur/data.cpp | 11 | ||||
-rw-r--r-- | engines/voyeur/voyeur.cpp | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp index 77e33371b0..3227e3cd45 100644 --- a/engines/voyeur/data.cpp +++ b/engines/voyeur/data.cpp @@ -88,12 +88,7 @@ void SVoy::synchronize(Common::Serializer &s) { s.syncAsSint16LE(_vocSecondsOffset); s.syncAsSint16LE(_field46E); s.syncAsSint16LE(_field470); - s.syncAsSint16LE(_aptLoadMode); - if (s.isLoading()) - // Reset apartment loading mode to initial game value - _aptLoadMode = 140; - s.syncAsSint16LE(_transitionId); s.syncAsSint16LE(_RTVLimit); s.syncAsSint16LE(_field478); @@ -120,6 +115,12 @@ void SVoy::synchronize(Common::Serializer &s) { s.syncAsSint16LE(_field4380); s.syncAsSint16LE(_field4382); s.syncAsSint16LE(_videoEventId); + + if (s.isLoading()) { + // Reset apartment loading mode to initial game value + _aptLoadMode = 140; + _viewBounds = nullptr; + } } void SVoy::addVideoEventStart() { diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index 06617be585..d5de47d34a 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -702,7 +702,6 @@ void VoyeurEngine::loadGame(int slot) { header._thumbnail->free(); delete header._thumbnail; - serializer.syncVersion(header._version); synchronize(serializer); delete saveFile; @@ -749,7 +748,6 @@ void VoyeurEngine::synchronize(Common::Serializer &s) { s.syncAsSint16LE(_videoId); s.syncAsSint16LE(_iForceDeath); - s.syncAsSint16LE(_checkTransitionId); s.syncAsSint16LE(_gameHour); s.syncAsSint16LE(_gameMinute); s.syncAsSint16LE(_flashTimeVal); |