aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Castricum2016-06-27 21:25:44 +0200
committerBen Castricum2016-07-01 08:25:28 +0200
commit8957bf4d7f13f28507a382bdd32c6f38d819ae27 (patch)
tree92d550e840cbc9b0e10a0009798c15323ba255e2
parent315ad620af5b1481c595d60ec481355b88f67537 (diff)
downloadscummvm-rg350-8957bf4d7f13f28507a382bdd32c6f38d819ae27.tar.gz
scummvm-rg350-8957bf4d7f13f28507a382bdd32c6f38d819ae27.tar.bz2
scummvm-rg350-8957bf4d7f13f28507a382bdd32c6f38d819ae27.zip
SCUMM: reset ShakePos on loading, fixes one part of bug #7141
-rw-r--r--engines/scumm/saveload.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 40dc83c7f3..0ab36d1a96 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1137,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();