[Scummvm-cvs-logs] scummvm master -> 6a1dbf97b4e724c2f12339eabf0849cc847ec641

sev- sev at scummvm.org
Sun Jul 3 11:56:21 CEST 2016 

This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a2059e13f SCUMM: Use exact strings in stringtable, fixes bug #6886
315ad620af SKY: change "savegame" into "saved game"
8957bf4d7f SCUMM: reset ShakePos on loading, fixes one part of bug #7141
da55658a80 SDL: Fix mouse trailing part of bug #7141
6a1dbf97b4 Merge pull request #772 from BenCastricum/bugfixes


Commit: 6a2059e13fee46cce3af57a3849969576412559a
    https://github.com/scummvm/scummvm/commit/6a2059e13fee46cce3af57a3849969576412559a
Author: Ben Castricum (scummvm at bencastricum.nl)
Date: 2016-07-01T07:33:36+02:00

Commit Message:
SCUMM: Use exact strings in stringtable, fixes bug #6886

Similar (fix) to bug #6739

Changed paths:
    engines/scumm/dialogs.cpp



diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 8a6b545..9b09f42 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"},


Commit: 315ad620af5b1481c595d60ec481355b88f67537
    https://github.com/scummvm/scummvm/commit/315ad620af5b1481c595d60ec481355b88f67537
Author: Ben Castricum (scummvm at bencastricum.nl)
Date: 2016-07-01T07:34:28+02:00

Commit Message:
SKY: change "savegame" into "saved game"

Changed paths:
    devtools/skycpt/README
    engines/sky/control.cpp



diff --git a/devtools/skycpt/README b/devtools/skycpt/README
index 4b303cb..ec7828f 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/sky/control.cpp b/engines/sky/control.cpp
index 9f4b6c2..a3fef3c 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);


Commit: 8957bf4d7f13f28507a382bdd32c6f38d819ae27
    https://github.com/scummvm/scummvm/commit/8957bf4d7f13f28507a382bdd32c6f38d819ae27
Author: Ben Castricum (scummvm at bencastricum.nl)
Date: 2016-07-01T08:25:28+02:00

Commit Message:
SCUMM: reset ShakePos on loading, fixes one part of bug #7141

Changed paths:
    engines/scumm/saveload.cpp



diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 40dc83c..0ab36d1 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();


Commit: da55658a804e12feb068d148d9d2d41c62b0e2f9
    https://github.com/scummvm/scummvm/commit/da55658a804e12feb068d148d9d2d41c62b0e2f9
Author: Ben Castricum (scummvm at bencastricum.nl)
Date: 2016-07-01T08:26:03+02:00

Commit Message:
SDL: Fix mouse trailing part of bug #7141

Overlays are shown with _currentShakePos offset too, so no need to
compensate the mousepointer position for overlays. This compensation
was done inconsistently in draw/undraw mouse causing the mouse trails.

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp



diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 2134551..5b591e7 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);


Commit: 6a1dbf97b4e724c2f12339eabf0849cc847ec641
    https://github.com/scummvm/scummvm/commit/6a1dbf97b4e724c2f12339eabf0849cc847ec641
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-03T11:56:16+02:00

Commit Message:
Merge pull request #772 from BenCastricum/bugfixes

MISC: Bugfixes

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp
    devtools/skycpt/README
    engines/scumm/dialogs.cpp
    engines/scumm/saveload.cpp
    engines/sky/control.cpp

More information about the Scummvm-git-logs mailing list