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

[bluegr]

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:
dd88556a0c SCUMM: Fix autosave


Commit: dd88556a0ce0537315ea2ead59dbb361be003dff
    https://github.com/scummvm/scummvm/commit/dd88556a0ce0537315ea2ead59dbb361be003dff
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-05-01T11:30:45+03:00

Commit Message:
SCUMM: Fix autosave

Autosave was centralized in 30d34fa63d1f5ccf37dfd9c80b0009c4115e78f2, but
SCUMM engine was left behind.

Bugreport #12026

Changed paths:
    engines/scumm/scumm.cpp
    engines/scumm/scumm.h


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ae16ad429f..b71458f415 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2315,14 +2315,6 @@ void ScummEngine::scummLoop(int delta) {
 		}
 	}
 
-	// Trigger autosave if necessary.
-	if (!_saveLoadFlag && shouldPerformAutoSave(_lastSaveTime) && canSaveGameStateCurrently()) {
-		_saveLoadSlot = 0;
-		_saveLoadDescription = Common::String::format("Autosave %d", _saveLoadSlot);
-		_saveLoadFlag = 1;
-		_saveTemporaryState = false;
-	}
-
 	if (VAR_GAME_LOADED != 0xFF)
 		VAR(VAR_GAME_LOADED) = 0;
 load_game:
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index af561c2f59..6443a08911 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -340,10 +340,6 @@ public:
 	bool canLoadGameStateCurrently() override;
 	Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave = false) override;
 	bool canSaveGameStateCurrently() override;
-	bool canSaveAutosaveCurrently() override {
-		// Keep base engine autosave code disabled in favour of engine's autosave code
-		return false;
-	}
 
 	void pauseEngineIntern(bool pause) override;