[Scummvm-git-logs] scummvm master -> 9494041fde07dc430d3d6704ef2b33ae83581112

[moralrecordings]

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

Summary:
9494041fde FOOL: Use target name instead of game ID for save game prefix


Commit: 9494041fde07dc430d3d6704ef2b33ae83581112
    https://github.com/scummvm/scummvm/commit/9494041fde07dc430d3d6704ef2b33ae83581112
Author: Scott Percival (code at moral.net.au)
Date: 2026-07-20T23:51:19+08:00

Commit Message:
FOOL: Use target name instead of game ID for save game prefix

Changed paths:
    engines/fool/fool.cpp
    engines/fool/fool.h
    engines/fool/fool_game.cpp


diff --git a/engines/fool/fool.cpp b/engines/fool/fool.cpp
index 455613883b9..8d6fac694e7 100644
--- a/engines/fool/fool.cpp
+++ b/engines/fool/fool.cpp
@@ -72,7 +72,7 @@ Common::Error FoolEngine::run() {
 	int startSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
 	Common::String startSaveFileName;
 	if (startSlot != -1) {
-		startSaveFileName = g_engine->getMetaEngine()->getSavegameFile(startSlot, getGameId().c_str());
+		startSaveFileName = g_engine->getMetaEngine()->getSavegameFile(startSlot, getTarget().c_str());
 	}
 
 	FoolGame fg(version, startSaveFileName);
diff --git a/engines/fool/fool.h b/engines/fool/fool.h
index 72fcfdbed9e..7a5e63b1668 100644
--- a/engines/fool/fool.h
+++ b/engines/fool/fool.h
@@ -26,14 +26,11 @@
 #include "common/system.h"
 #include "common/error.h"
 #include "common/fs.h"
-#include "common/hash-str.h"
 #include "common/random.h"
 #include "common/serializer.h"
 #include "common/util.h"
 #include "engines/engine.h"
-#include "engines/savestate.h"
 #include "graphics/macgui/macwindowmanager.h"
-#include "graphics/screen.h"
 
 #include "fool/detection.h"
 
@@ -95,6 +92,10 @@ public:
 		return true;
 	}
 
+	const Common::String getTarget() {
+		return _targetName;
+	}
+
 	/**
 	 * Uses a serializer to allow implementing savegame
 	 * loading and saving using a single method
diff --git a/engines/fool/fool_game.cpp b/engines/fool/fool_game.cpp
index 2a41bbdfb88..d454eeddd0e 100644
--- a/engines/fool/fool_game.cpp
+++ b/engines/fool/fool_game.cpp
@@ -92,7 +92,7 @@ static const byte fondSmall[] = {
 };
 
 Common::String getFileNameFromModal(bool save, const Common::String &suggested, const Common::String &title) {
-	Common::String target = g_engine->getGameId();
+	Common::String target = g_engine->getTarget();
 	Common::String result;
 	GUI::SaveLoadChooser chooser(title, Common::U32String(save ? _("Save") : _("Open")), save);
 	int slot = chooser.runModalWithCurrentTarget();
@@ -1696,7 +1696,7 @@ void FoolGame::autoSaveGame() {
 	// This wrapper changes the autosave behaviour to match the rest of ScummVM.
 	_isAutoSaving = true;
 	Common::U32String previous = _saveFileName;
-	_saveFileName = Common::U32String::format("%s-Autosave.000", g_engine->getGameId().c_str());
+	_saveFileName = Common::U32String::format("%s-Autosave.000", g_engine->getTarget().c_str());
 	saveGame();
 	_saveFileName = previous;
 	_isAutoSaving = false;