[Scummvm-git-logs] scummvm master -> f1809916a4a71213eec405e27a6dbd1b86c0948a

[sev-]

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

Summary:
24c7e0e70c CINE: FW: Fix disabled action menu after loading.
f1809916a4 CINE: Fix autosave thumbnail generating.


Commit: 24c7e0e70cb776ed985583a9aa901733d08e8977
    https://github.com/scummvm/scummvm/commit/24c7e0e70cb776ed985583a9aa901733d08e8977
Author: Kari Salminen (kari.salminen at gmail.com)
Date: 2020-08-01T20:26:44+02:00

Commit Message:
CINE: FW: Fix disabled action menu after loading.

Future Wars PC disassembly does not save disableSysteMenu variable.
After adding versioning to Future Wars saves this value was also
saved and loaded but using it on load seems to have caused the
action menu (EXAMINE, TAKE, INVENTORY, ...) to be disabled sometimes
when it is not supposed to be disabled. Thus, now skipping the loading
of disableSystemMenu variable for versioned Future Wars saves.

Changed paths:
    engines/cine/cine.cpp
    engines/cine/saveload.cpp


diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp
index 82e8038376..6bd24bbfa6 100644
--- a/engines/cine/cine.cpp
+++ b/engines/cine/cine.cpp
@@ -235,6 +235,12 @@ void CineEngine::initialize() {
 		// A proper fix here would be to save this variable in FW's saves.
 		// Since it seems these are unversioned so far, there would be need
 		// to properly add versioning to them first.
+		//
+		// Adding versioning to FW saves didn't solve this problem. Setting
+		// disableSystemMenu according to the saved value still caused the
+		// action menu (EXAMINE, TAKE, INVENTORY, ...) sometimes to be
+		// disabled when it wasn't supposed to be disabled when
+		// loading from the launcher or command line.
 		disableSystemMenu = 0;
 	}
 
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 8d8fcb43fc..32073626af 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -783,7 +783,13 @@ bool CineEngine::loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFor
 	loadOverlayList(in);
 	loadBgIncrustFromSave(in);
 
-	disableSystemMenu = ((version >= 4) ? in.readUint16BE() : 0);
+	if (version >= 4) {
+		// Skip the saved value of disableSystemMenu because using its value
+		// sometimes disabled the action menu (i.e. EXAMINE, TAKE, INVENTORY, ...)
+		// when it wasn't supposed to be disabled when loading from the launcher
+		// or command line.
+		in.readUint16BE();
+	}
 
 	if (strlen(currentMsgName)) {
 		loadMsg(currentMsgName);


Commit: f1809916a4a71213eec405e27a6dbd1b86c0948a
    https://github.com/scummvm/scummvm/commit/f1809916a4a71213eec405e27a6dbd1b86c0948a
Author: Kari Salminen (kari.salminen at gmail.com)
Date: 2020-08-01T20:26:44+02:00

Commit Message:
CINE: Fix autosave thumbnail generating.

Using the current screen contents for autosaves now.
For non-autosaves the screen contents before opening
the system menu are used.

Changed paths:
    engines/cine/saveload.cpp


diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 32073626af..378b43f3c9 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -1026,7 +1026,7 @@ void CineEngine::makeSave(const Common::String &saveFileName, uint32 playtime,
 	}
 
 	renderer->saveBackBuffer(BEFORE_TAKING_THUMBNAIL);
-	if (renderer->hasSavedBackBuffer(BEFORE_OPENING_MENU)) {
+	if (!isAutosave && renderer->hasSavedBackBuffer(BEFORE_OPENING_MENU)) {
 		renderer->popSavedBackBuffer(BEFORE_OPENING_MENU);
 	}