diff options
| author | Filippos Karapetis | 2012-11-15 14:57:55 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2012-11-15 14:57:55 +0200 |
| commit | fb0788d12ffd4fedaa5019d47c547f538d25ff7c (patch) | |
| tree | cd1b02230d407b12a5b16d5f9710d6557f453316 /engines/sci/engine/savegame.cpp | |
| parent | 2c8cd2d653830a3b10578254c32f2361f1e05a7b (diff) | |
| download | scummvm-rg350-fb0788d12ffd4fedaa5019d47c547f538d25ff7c.tar.gz scummvm-rg350-fb0788d12ffd4fedaa5019d47c547f538d25ff7c.tar.bz2 scummvm-rg350-fb0788d12ffd4fedaa5019d47c547f538d25ff7c.zip | |
SCI: Properly reset the palVary signal when loading (bug #3575569)
Diffstat (limited to 'engines/sci/engine/savegame.cpp')
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 2a39f24ecd..b2d95c599e 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -696,8 +696,9 @@ void GfxPalette::saveLoadWithSerializer(Common::Serializer &s) { s.syncAsSint32LE(_palVaryPaused); } + _palVarySignal = 0; + if (s.isLoading() && _palVaryResourceId != -1) { - _palVarySignal = 0; palVaryInstallTimer(); } } @@ -878,10 +879,6 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { } } - // Remove the palVary effect timer, if there is one running currently. - // Fixes bug #3575569. - g_sci->_gfxPalette->palVaryRemoveTimer(); - // We don't need the thumbnail here, so just read it and discard it Graphics::skipThumbnail(*fh); |