COMPOSER: Remove autosave code

whoozle · Feb 16, 2020 · b1197cf · b1197cf
1 parent 128bd50
commit b1197cf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
@@ -123,7 +123,6 @@ Common::Error ComposerEngine::run() {
 	else
 		warning("FPS in book.ini is zero. Defaulting to 8...");
 	uint32 lastDrawTime = 0;
-	_lastSaveTime = _system->getMillis();
 
 	bool loadFromLauncher = ConfMan.hasKey("save_slot");
 
@@ -179,8 +178,7 @@ Common::Error ComposerEngine::run() {
 			loadGameState(ConfMan.getInt("save_slot"));
 			loadFromLauncher = false;
 		}
-		if (shouldPerformAutoSave(_lastSaveTime))
-			saveGameState(0, "Autosave");
+
 		while (_eventMan->pollEvent(event)) {
 			switch (event.type) {
 			case Common::EVENT_LBUTTONDOWN:

diff --git a/engines/composer/composer.h b/engines/composer/composer.h
@@ -193,7 +193,7 @@ class ComposerEngine : public Engine {
 	Audio::QueuingAudioStream *_audioStream;
 	uint16 _currSoundPriority;
 
-	uint32 _currentTime, _lastTime, _timeDelta, _lastSaveTime;
+	uint32 _currentTime, _lastTime, _timeDelta;
 
 	bool _needsUpdate;
 	Common::Array<Common::Rect> _dirtyRects;

diff --git a/engines/composer/saveload.cpp b/engines/composer/saveload.cpp
@@ -366,17 +366,12 @@ Common::Error ComposerEngine::loadGameState(int slot) {
 	if (!_mixer->isSoundHandleActive(_soundHandle))
 		_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, _audioStream);
 
-
-	// Reset autosave duration on load
-	_lastSaveTime = _system->getMillis();
-
 	return Common::kNoError;
 }
 
 Common::Error ComposerEngine::saveGameState(int slot, const Common::String &desc, bool isAutosave) {
 	Common::String filename = makeSaveGameName(slot);
 	Common::OutSaveFile *out;
-	_lastSaveTime = _system->getMillis();
 	if (!(out = _saveFileMan->openForSaving(filename)))
 		return Common::kWritingFailed;