diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/dialogs.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/saveload.cpp | 4 | ||||
| -rw-r--r-- | engines/sky/control.cpp | 4 |
3 files changed, 8 insertions, 4 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(); diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index 9f4b6c21c6..a3fef3c0cd 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -1338,13 +1338,13 @@ uint16 Control::parseSaveData(uint8 *srcBuf) { displayMessage(0, "Unknown save file revision (%d)", saveRev); return RESTORE_FAILED; } else if (saveRev < OLD_SAVEGAME_TYPE) { - displayMessage(0, "This savegame version is unsupported."); + displayMessage(0, "This saved game version is unsupported."); return RESTORE_FAILED; } LODSD(srcPos, gameVersion); if (gameVersion != SkyEngine::_systemVars.gameVersion) { if ((!SkyEngine::isCDVersion()) || (gameVersion < 365)) { // cd versions are compatible - displayMessage(NULL, "This savegame was created by\n" + displayMessage(NULL, "This saved game was created by\n" "Beneath a Steel Sky v0.0%03d\n" "It cannot be loaded by this version (v0.0%3d)", gameVersion, SkyEngine::_systemVars.gameVersion); |