Merge pull request #772 from BenCastricum/bugfixes

MISC: Bugfixes

5 files changed, 12 insertions, 10 deletions

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 21345515bc..5b591e77ff 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -2047,7 +2047,7 @@ void SurfaceSdlGraphicsManager::undrawMouse() {
 		return;
 
 	if (_mouseBackup.w != 0 && _mouseBackup.h != 0)
-		addDirtyRect(x, y - _currentShakePos, _mouseBackup.w, _mouseBackup.h);
+		addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h);
 }
 
 void SurfaceSdlGraphicsManager::drawMouse() {
@@ -2088,9 +2088,7 @@ void SurfaceSdlGraphicsManager::drawMouse() {
 	// We draw the pre-scaled cursor image, so now we need to adjust for
 	// scaling, shake position and aspect ratio correction manually.
 
-	if (!_overlayVisible) {
-		dst.y += _currentShakePos;
-	}
+	dst.y += _currentShakePos;
 
 	if (_videoMode.aspectRatioCorrection && !_overlayVisible)
 		dst.y = real2Aspect(dst.y);
diff --git a/devtools/skycpt/README b/devtools/skycpt/README
index 4b303cb0e9..ec7828f35c 100644
--- a/devtools/skycpt/README
+++ b/devtools/skycpt/README
@@ -16,8 +16,8 @@ This program was only included in ScummVM's source tree because the Debian licen
 forces us to.
 Instead download the file from http://www.scummvm.org/
 Also, please be aware that if you create your own CPT file (if it isn't exactly the same as the
-one we offer for download at www.scummvm.org), it will be incompatible and the savegames produced
-using the file will be incompatible with ScummVM using the normal CPT file.
+one we offer for download at www.scummvm.org), it will be incompatible and the saved games
+produced using the file will be incompatible with ScummVM using the normal CPT file.
 The incompatibility will not be detected by ScummVM, it will most probably simply crash.
 
 If you still want to waste your time by creating this file:
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);