[Scummvm-git-logs] scummvm master -> 05620460e05fb0fbe1cdc6d069536d1bffb6d08d

[dreammaster]

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:
05620460e0 ENGINES: Fix savegame filename format for new-type saves


Commit: 05620460e05fb0fbe1cdc6d069536d1bffb6d08d
    https://github.com/scummvm/scummvm/commit/05620460e05fb0fbe1cdc6d069536d1bffb6d08d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-18T21:19:32-07:00

Commit Message:
ENGINES: Fix savegame filename format for new-type saves

This also fixes a problem with the Griffin engine, which
although it was using the new type saves, was using a
target.s?? format, so wasn't listing files in the GMM
save dialog

Changed paths:
    engines/griffon/detection.cpp
    engines/metaengine.cpp


diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index bd20fcb4d4..04ffddafea 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -78,10 +78,27 @@ public:
 	virtual int getAutosaveSlot() const override {
 		return 4;
 	}
+	const char *getSavegameFile(int saveGameIdx, const char *target = nullptr) const override;
+	const char *getSavegamePattern(const char *target = nullptr) const override;
 
 	Common::KeymapArray initKeymaps(const char *target) const override;
 };
 
+
+const char *GriffonMetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
+	static char buffer[200];
+	snprintf(buffer, sizeof(buffer), "%s.s%02d", target == nullptr ? getEngineId() : target, saveGameIdx);
+
+	return buffer;
+}
+
+const char *GriffonMetaEngine::getSavegamePattern(const char *target) const {
+	static char buffer[200];
+	snprintf(buffer, sizeof(buffer), "%s.s##", target == nullptr ? getEngineId() : target);
+
+	return buffer;
+}
+
 bool Griffon::GriffonEngine::hasFeature(EngineFeature f) const {
 	return
 		(f == kSupportsReturnToLauncher) ||
diff --git a/engines/metaengine.cpp b/engines/metaengine.cpp
index c4bda267fa..b682d82220 100644
--- a/engines/metaengine.cpp
+++ b/engines/metaengine.cpp
@@ -39,8 +39,9 @@
 
 const char *MetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
 	static char buffer[200];
+	const char *pattern = hasFeature(kSavesUseExtendedFormat) ?  "%s.%03d" : "%s.s%02d";
 
-	snprintf(buffer, sizeof(buffer), "%s.s%02d", target == nullptr ? getEngineId() : target, saveGameIdx);
+	snprintf(buffer, sizeof(buffer), pattern, target == nullptr ? getEngineId() : target, saveGameIdx);
 
 	return buffer;
 }