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

[sev-]

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:
bd7f77e126 PINK: Use the actual target when searching for saves


Commit: bd7f77e126783bca2560a377ef1857df478fc278
    https://github.com/scummvm/scummvm/commit/bd7f77e126783bca2560a377ef1857df478fc278
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2022-08-04T20:15:07+02:00

Commit Message:
PINK: Use the actual target when searching for saves

This ensures consistent behavior between listing and loading of saves

Changed paths:
    engines/pink/gui.cpp
    engines/pink/pink.h


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 8d70454085b..d898f567393 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -146,9 +146,9 @@ struct SaveStateDescriptorTimeComparator {
 	}
 };
 
-static SaveStateList listSaves(bool isPeril) {
+SaveStateList PinkEngine::listSaves() const {
 	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
-	Common::String pattern = isPeril ? "peril.s##" : "pokus.s##";
+	Common::String pattern = getMetaEngine()->getSavegameFile(kSavegameFilePattern, _targetName.c_str());
 	Common::StringArray filenames = saveFileMan->listSavefiles(pattern);
 
 	SaveStateList saveList;
@@ -179,7 +179,7 @@ void PinkEngine::initMenu() {
 
 	Graphics::MacMenuSubMenu *subMenu = _menu->getSubmenu(nullptr, 0);
 	if (subMenu) {
-		SaveStateList saves = listSaves(isPeril());
+		SaveStateList saves = listSaves();
 		if (!saves.empty()) {
 			_menu->removeMenuItem(subMenu, kRecentSaveId);
 			int maxSaves = saves.size() > kMaxSaves ? kMaxSaves : saves.size();
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index c197e629378..d9a39054e5b 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -105,6 +105,7 @@ public:
 	Common::String getSaveStateName(int slot) const override {
 		return Common::String::format("%s.s%02d", _targetName.c_str(), slot);
 	}
+	SaveStateList listSaves() const;
 
 	friend class Console;