MOHAWK: Hook Myst & Riven into SaveStateDescriptor autosave flag

scummvm · Feb 16, 2020 · 8766e22 · 8766e22
1 parent 908326a
commit 8766e22
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
@@ -967,7 +967,7 @@ Common::Error MohawkEngine_Myst::saveGameState(int slot, const Common::String &d
 		thumbnail = _gfx->getThumbnailForMainMenu();
 	}
 
-	return _gameState->save(slot, desc, thumbnail, false) ? Common::kNoError : Common::kUnknownError;
+	return _gameState->save(slot, desc, thumbnail, isAutosave) ? Common::kNoError : Common::kUnknownError;
 }
 
 bool MohawkEngine_Myst::canSaveAutosaveCurrently() {

diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp
@@ -320,10 +320,12 @@ SaveStateDescriptor MystGameState::querySaveMetaInfos(int slot) {
 	}
 
 	// Set the save description
+	desc.setSaveSlot(slot);
 	desc.setDescription(metadata.saveDescription);
 	desc.setSaveDate(metadata.saveYear, metadata.saveMonth, metadata.saveDay);
 	desc.setSaveTime(metadata.saveHour, metadata.saveMinute);
 	desc.setPlayTime(metadata.totalPlayTime);
+	desc.setAutosave(metadata.autoSave);
 	if (metadata.autoSave) // Allow non-saves to be deleted, but not autosaves
 		desc.setDeletableFlag(slot != kAutoSaveSlot);
 

diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp
@@ -135,10 +135,12 @@ SaveStateDescriptor RivenSaveLoad::querySaveMetaInfos(const int slot) {
 		return descriptor;
 	}
 
+	descriptor.setSaveSlot(slot);
 	descriptor.setDescription(metadata.saveDescription);
 	descriptor.setPlayTime(metadata.totalPlayTime);
 	descriptor.setSaveDate(metadata.saveYear, metadata.saveMonth, metadata.saveDay);
 	descriptor.setSaveTime(metadata.saveHour, metadata.saveMinute);
+	descriptor.setAutosave(metadata.autoSave);
 
 	delete metaStream;