libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENGINES: Add missing getSavegameFile overrides

Browse Source 
... for non-default names.

Fixes moving autosave to a new slot.

Trac #12977
This commit is contained in:
Orgad Shaneh 2021-10-19 23:18:35 +03:00 committed by Eugene Sandulenko
parent e2d4740272
commit 0db343d364
7 changed files with 63 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/composer/metaengine.cpp
View File

@ -76,6 +76,14 @@ public:
int getMaximumSaveSlot() const override;
SaveStateList listSaves(const char* target) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.##", target);
else
return Common::String::format("%s.%02d", target, saveGameIdx);
}
};
Common::Error ComposerMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
@ -103,9 +111,8 @@ SaveStateList ComposerMetaEngine::listSaves(const char *target) const {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
Common::String saveDesc;
Common::String pattern = Common::String::format("%s.##", target);
filenames = saveFileMan->listSavefiles(pattern);
filenames = saveFileMan->listSavefiles(getSavegameFilePattern(target));
SaveStateList saveList;
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {

15
engines/cryomni3d/metaengine.cpp
View File

@ -79,6 +79,14 @@ public:
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override { return 999; }
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.####", target);
else
return Common::String::format("%s.%04d", target, saveGameIdx + 1);
}
};
bool CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const {
@ -98,8 +106,7 @@ SaveStateList CryOmni3DMetaEngine::listSaves(const char *target) const {
char saveName[kSaveDescriptionLen + 1];
saveName[kSaveDescriptionLen] = '\0';
Common::String pattern = Common::String::format("%s.????", target);
Common::StringArray filenames = saveMan->listSavefiles(pattern);
Common::StringArray filenames = saveMan->listSavefiles(getSavegameFilePattern(target));
sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..)
int slotNum;
@ -124,9 +131,7 @@ SaveStateList CryOmni3DMetaEngine::listSaves(const char *target) const {
}
void CryOmni3DMetaEngine::removeSaveState(const char *target, int slot) const {
Common::String filename = Common::String::format("%s.%04d", target, slot + 1);
g_system->getSavefileManager()->removeSavefile(filename);
g_system->getSavefileManager()->removeSavefile(getSavegameFile(slot, target));
}
Common::Error CryOmni3DMetaEngine::createInstance(OSystem *syst, Engine **engine,

15
engines/hugo/metaengine.cpp
View File

@ -53,7 +53,14 @@ public:
SaveStateList listSaves(const char *target) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s-##.SAV", target);
else
return Common::String::format("%s-%02d.SAV", target, saveGameIdx);
}
};
Common::Error HugoMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const {
@ -123,8 +130,7 @@ SaveStateList HugoMetaEngine::listSaves(const char *target) const {
}
SaveStateDescriptor HugoMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
Common::String fileName = Common::String::format("%s-%02d.SAV", target, slot);
Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(fileName);
Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(getSavegameFile(slot, target));
if (file) {
int saveVersion = file->readByte();
@ -171,8 +177,7 @@ SaveStateDescriptor HugoMetaEngine::querySaveMetaInfos(const char *target, int s
}
void HugoMetaEngine::removeSaveState(const char *target, int slot) const {
Common::String fileName = Common::String::format("%s-%02d.SAV", target, slot);
g_system->getSavefileManager()->removeSavefile(fileName);
g_system->getSavefileManager()->removeSavefile(getSavegameFile(slot, target));
}
} // End of namespace Hugo

14
engines/lilliput/metaengine.cpp
View File

@ -57,6 +57,14 @@ public:
SaveStateList listSaves(const char *target) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s-##.SAV", target);
else
return Common::String::format("%s-%02d.SAV", target, saveGameIdx);
}
};
Common::Error LilliputMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const {
@ -128,8 +136,7 @@ SaveStateList LilliputMetaEngine::listSaves(const char *target) const {
}
SaveStateDescriptor LilliputMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
Common::String fileName = Common::String::format("%s-%02d.SAV", target, slot);
Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(fileName);
Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(getSavegameFile(slot, target));
if (file) {
int saveVersion = file->readByte();
@ -177,8 +184,7 @@ SaveStateDescriptor LilliputMetaEngine::querySaveMetaInfos(const char *target, i
}
void LilliputMetaEngine::removeSaveState(const char *target, int slot) const {
Common::String fileName = Common::String::format("%s-%02d.SAV", target, slot);
g_system->getSavefileManager()->removeSavefile(fileName);
g_system->getSavefileManager()->removeSavefile(getSavegameFile(slot, target));
}
} // End of namespace Lilliput

9
engines/stark/metaengine.cpp
View File

@ -118,6 +118,15 @@ public:
*engine = new StarkEngine(syst, desc);
return Common::kNoError;
}
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s-###.tlj", target);
else
return StarkEngine::formatSaveName(target, saveGameIdx);
}
};
} // End of namespace Stark

14
engines/teenagent/metaengine.cpp
View File

@ -59,8 +59,13 @@ public:
return Common::kNoError;
}
static Common::String generateGameStateFileName(const char *target, int slot) {
return Common::String::format("%s.%02d", target, slot);
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.##", target);
else
return Common::String::format("%s.%02d", target, saveGameIdx);
}
SaveStateList listSaves(const char *target) const override {
@ -94,12 +99,11 @@ public:
}
void removeSaveState(const char *target, int slot) const override {
Common::String filename = generateGameStateFileName(target, slot);
g_system->getSavefileManager()->removeSavefile(filename);
g_system->getSavefileManager()->removeSavefile(getSavegameFile(slot, target));
}
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override {
Common::String filename = generateGameStateFileName(target, slot);
Common::String filename = getSavegameFile(slot, target);
Common::ScopedPtr<Common::InSaveFile> in(g_system->getSavefileManager()->openForLoading(filename));
if (!in)
return SaveStateDescriptor();

6
engines/tucker/metaengine.cpp
View File

@ -145,6 +145,12 @@ public:
delete file;
return desc;
}
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
return Tucker::generateGameStateFileName(target, saveGameIdx, saveGameIdx == kSavegameFilePattern);
}
};
#if PLUGIN_ENABLED_DYNAMIC(TUCKER)