diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/scumm/saveload.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/scumm/saveload.cpp')
| -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 e5673c1803..0ab36d1a96 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -41,8 +41,6 @@ #include "scumm/he/sprite_he.h" #include "scumm/verbs.h" -#include "audio/mixer.h" - #include "backends/audiocd/audiocd.h" #include "graphics/thumbnail.h" @@ -1139,6 +1137,10 @@ void ScummEngine::saveOrLoad(Serializer *s) { if (s->isLoading() && s->getVersion() < VER(14)) upgradeGfxUsageBits(); + // When loading, reset the ShakePos. Fixes one part of bug #7141 + if (s->isLoading() && s->getVersion() >= VER(10)) + _system->setShakePos(0); + // When loading, move the mouse to the saved mouse position. if (s->isLoading() && s->getVersion() >= VER(20)) { updateCursor(); @@ -1303,7 +1305,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { if (hasTownsData) { // Skip FM-Towns specific data - for (int i = 69 * sizeof(uint8) + 44 * sizeof(int16); i; i--) + for (i = 69 * sizeof(uint8) + 44 * sizeof(int16); i; i--) s->loadByte(); } |