[Scummvm-git-logs] scummvm master -> 3f30e2dd06dbdf0d12849a9850a21e84b60f2b6c

[csnover]

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

Summary:
5cca33702d SCI32: Fix version file read failure in LSL6hires
ac95f2595b SCI32: Fix deleting save games in native save/load dialogue
1c5a5d09f9 SCI32: Fix Return to Launcher in F5 menu
3f30e2dd06 SCI32: Fix uninitialized read when starting a new game in LSL6hires


Commit: 5cca33702d2544e3e470142843144faf4fef83d2
    https://github.com/scummvm/scummvm/commit/5cca33702d2544e3e470142843144faf4fef83d2
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-05T15:19:11-05:00

Commit Message:
SCI32: Fix version file read failure in LSL6hires

Changed paths:
    engines/sci/engine/kfile.cpp



diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 76cae6c..f734390 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -306,6 +306,11 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) {
 	// their game version from the VERSION file
 	if (name.compareToIgnoreCase("version") == 0) {
 		unwrapFilename = false;
+
+		// LSL6hires version is in a file with an empty extension
+		if (Common::File::exists(name + ".")) {
+			name += ".";
+		}
 	}
 
 	if (g_sci->getGameId() == GID_SHIVERS && name.hasSuffix(".SG")) {


Commit: ac95f2595b92d9263161992d0d63029425901dd9
    https://github.com/scummvm/scummvm/commit/ac95f2595b92d9263161992d0d63029425901dd9
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-05T15:19:11-05:00

Commit Message:
SCI32: Fix deleting save games in native save/load dialogue

Changed paths:
    engines/sci/engine/kfile.cpp



diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index f734390..386c4bc 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -1350,7 +1350,7 @@ reg_t kMakeSaveFileName(EngineState *s, int argc, reg_t *argv) {
 	SciArray &outFileName = *s->_segMan->lookupArray(argv[0]);
 	// argv[1] is the game name, which is not used by ScummVM
 	const int16 saveNo = argv[2].toSint16();
-	outFileName.fromString(g_sci->getSavegameName(saveNo));
+	outFileName.fromString(g_sci->getSavegameName(saveNo + kSaveIdShift));
 	return argv[0];
 }
 


Commit: 1c5a5d09f942561ffeddbe9596da147710824d11
    https://github.com/scummvm/scummvm/commit/1c5a5d09f942561ffeddbe9596da147710824d11
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-05T15:30:31-05:00

Commit Message:
SCI32: Fix Return to Launcher in F5 menu

Closes #837.

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 345b380..bef3edb 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -205,7 +205,7 @@ SciEvent EventManager::getScummVMEvent() {
 
 		return noEvent;
 	}
-	if (ev.type == Common::EVENT_QUIT) {
+	if (ev.type == Common::EVENT_QUIT || ev.type == Common::EVENT_RTL) {
 		input.type = SCI_EVENT_QUIT;
 		return input;
 	}


Commit: 3f30e2dd06dbdf0d12849a9850a21e84b60f2b6c
    https://github.com/scummvm/scummvm/commit/3f30e2dd06dbdf0d12849a9850a21e84b60f2b6c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-05T15:30:39-05:00

Commit Message:
SCI32: Fix uninitialized read when starting a new game in LSL6hires

Changed paths:
    engines/sci/engine/workarounds.cpp



diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 362f87a..4adc7eb 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -318,7 +318,7 @@ const SciWorkaroundEntry uninitializedReadWorkarounds[] = {
 	{ GID_LSL6,          820,    82,  0,                   "", "export 0",                        NULL,    -1, { WORKAROUND_FAKE,   0 } }, // when touching the electric fence - bug #5103
 	{ GID_LSL6,           -1,    85,  0,          "washcloth", "doVerb",                          NULL,     0, { WORKAROUND_FAKE,   0 } }, // washcloth in inventory
 	{ GID_LSL6,           -1,   928, -1,           "Narrator", "startText",                       NULL,     0, { WORKAROUND_FAKE,   0 } }, // used by various objects that are even translated in foreign versions, that's why we use the base-class
-	{ GID_LSL6HIRES,       0,    85,  0,             "LL6Inv", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // on startup
+	{ GID_LSL6HIRES,      -1,    85,  0,             "LL6Inv", "init",                            NULL,     0, { WORKAROUND_FAKE,   0 } }, // when creating a new game
 	{ GID_LSL6HIRES,      -1, 64950,  1,            "Feature", "handleEvent",                     NULL,     0, { WORKAROUND_FAKE,   0 } }, // at least when entering swimming pool area
 	{ GID_LSL6HIRES,      -1, 64964,  0,              "DPath", "init",                            NULL,     1, { WORKAROUND_FAKE,   0 } }, // during the game
 	{ GID_MOTHERGOOSE256, -1,     0,  0,                 "MG", "doit",                            NULL,     5, { WORKAROUND_FAKE,   0 } }, // SCI1.1: When moving the cursor all the way to the left during the game - bug #5224