[Scummvm-git-logs] scummvm master -> 525391c2d17ad882d3151d00c38fd4785376d952

[mgerhardy]

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

Summary:
525391c2d1 TWINE: fixed broken auto save on giveup


Commit: 525391c2d17ad882d3151d00c38fd4785376d952
    https://github.com/scummvm/scummvm/commit/525391c2d17ad882d3151d00c38fd4785376d952
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-09T22:25:31+01:00

Commit Message:
TWINE: fixed broken auto save on giveup

see https://bugs.scummvm.org/ticket/12036

Changed paths:
    engines/twine/scene/gamestate.cpp
    engines/twine/twine.cpp


diff --git a/engines/twine/scene/gamestate.cpp b/engines/twine/scene/gamestate.cpp
index 0db6b83811..59701a6302 100644
--- a/engines/twine/scene/gamestate.cpp
+++ b/engines/twine/scene/gamestate.cpp
@@ -508,6 +508,8 @@ void GameState::processGameoverAnimation() {
 
 void GameState::giveUp() {
 	_engine->_sound->stopSamples();
+	// TODO: is an autosave desired on giving up? I don't think so. What did the original game do here?
+	//_engine->autoSave();
 	initGameStateVars();
 	_engine->_scene->stopRunningGame();
 }
diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 35ce5fcecf..8a65ae3bce 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -711,8 +711,6 @@ int32 TwinEEngine::runGameEngine() { // mainLoopInteration
 			if (giveUp == 1) {
 				unfreezeTime();
 				_redraw->redrawEngineActions(true);
-				ScopedEngineFreeze freeze(this);
-				autoSave();
 				quitGame = 0;
 				return 0;
 			}