aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/dialogs.cpp4
-rw-r--r--engines/scumm/saveload.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 8a6b545bf2..9b09f426ef 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -149,8 +149,8 @@ static const ResString string_map_table_v6[] = {
{91, "Unable to Find %s, (%c%d) Press Button."},
{92, "Error reading disk %c, (%c%d) Press Button."},
{93, "Game Paused. Press SPACE to Continue."},
- {94, "Are you sure you want to restart? (Y/N)"},
- {95, "Are you sure you want to quit? (Y/N)"},
+ {94, "Are you sure you want to restart? (Y/N)Y"},
+ {95, "Are you sure you want to quit? (Y/N)Y"},
{96, "Save"},
{97, "Load"},
{98, "Play"},
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();