[Scummvm-git-logs] scummvm master -> 67c1e67fc978c1fcfc9925859d9865722b31f220

[mgerhardy]

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:
b13c079c69 TWINE: fixed manual save game description
67c1e67fc9 TWINE: fixed issue #12844 (Save Game handling seriously buggy)


Commit: b13c079c69dbc6779aa5eafe5e3632f2bde27bc3
    https://github.com/scummvm/scummvm/commit/b13c079c69dbc6779aa5eafe5e3632f2bde27bc3
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-25T08:51:18+02:00

Commit Message:
TWINE: fixed manual save game description

Changed paths:
    engines/twine/menu/menuoptions.cpp


diff --git a/engines/twine/menu/menuoptions.cpp b/engines/twine/menu/menuoptions.cpp
index 813113e837..e502707120 100644
--- a/engines/twine/menu/menuoptions.cpp
+++ b/engines/twine/menu/menuoptions.cpp
@@ -417,8 +417,7 @@ bool MenuOptions::saveGameMenu() {
 	_engine->restoreFrontBuffer();
 	const int slot = chooseSave(TextId::kCreateSaveGame, true);
 	if (slot >= 0) {
-		// TODO: enter description
-		Common::Error state = _engine->saveGameState(slot, "description", false);
+		Common::Error state = _engine->saveGameState(slot, _engine->_gameState->_sceneName, false);
 		if (state.getCode() != Common::kNoError) {
 			error("Failed to save slot %i", slot);
 			return false;


Commit: 67c1e67fc978c1fcfc9925859d9865722b31f220
    https://github.com/scummvm/scummvm/commit/67c1e67fc978c1fcfc9925859d9865722b31f220
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-08-25T08:51:18+02:00

Commit Message:
TWINE: fixed issue #12844 (Save Game handling seriously buggy)

Changed paths:
    engines/twine/menu/menuoptions.cpp


diff --git a/engines/twine/menu/menuoptions.cpp b/engines/twine/menu/menuoptions.cpp
index e502707120..532866568b 100644
--- a/engines/twine/menu/menuoptions.cpp
+++ b/engines/twine/menu/menuoptions.cpp
@@ -414,6 +414,9 @@ bool MenuOptions::deleteSaveMenu() {
 }
 
 bool MenuOptions::saveGameMenu() {
+	if (!_engine->_scene->isGameRunning()) {
+		return false;
+	}
 	_engine->restoreFrontBuffer();
 	const int slot = chooseSave(TextId::kCreateSaveGame, true);
 	if (slot >= 0) {