diff options
| author | Max Horn | 2010-07-01 16:06:04 +0000 |
|---|---|---|
| committer | Max Horn | 2010-07-01 16:06:04 +0000 |
| commit | aa6be750fb6c04c06fd7c423b64e445c515b0154 (patch) | |
| tree | 77d4cf781ebb7de588d664d667526595d0f2399a | |
| parent | 9d47b191f6302ac8960bb4d91d32104c0993a198 (diff) | |
| download | scummvm-rg350-aa6be750fb6c04c06fd7c423b64e445c515b0154.tar.gz scummvm-rg350-aa6be750fb6c04c06fd7c423b64e445c515b0154.tar.bz2 scummvm-rg350-aa6be750fb6c04c06fd7c423b64e445c515b0154.zip | |
SCI: Invoke resetSegMan from SegManager::saveLoadWithSerializer, not from EngineState::saveLoadWithSerializer
svn-id: r50554
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index bf29dbb046..dd8c3ca31d 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -178,6 +178,9 @@ void syncWithSerializer(Common::Serializer &s, reg_t &obj) { } void SegManager::saveLoadWithSerializer(Common::Serializer &s) { + if (s.isLoading()) + resetSegMan(); + s.skip(4, VER(9), VER(9)); // OBSOLETE: Used to be reserved_id s.skip(4, VER(9), VER(18)); // OBSOLETE: Used to be _exportsAreWide s.skip(4, VER(9), VER(9)); // OBSOLETE: Used to be gc_mark_bits @@ -340,9 +343,6 @@ void EngineState::saveLoadWithSerializer(Common::Serializer &s) { s.skip(1, VER(9), VER(9)); // obsolete: used to be a flag indicating if we got sci11 or not - if (s.isLoading()) - _segMan->resetSegMan(); - _segMan->saveLoadWithSerializer(s); g_sci->_soundCmd->syncPlayList(s); |