diff options
Diffstat (limited to 'engines')
52 files changed, 66 insertions, 184 deletions
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp index 435f0d1118..3e70de3635 100644 --- a/engines/access/detection.cpp +++ b/engines/access/detection.cpp @@ -100,7 +100,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -112,7 +111,8 @@ bool AccessMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } bool Access::AccessEngine::hasFeature(EngineFeature f) const { @@ -172,8 +172,6 @@ SaveStateList AccessMetaEngine::listSaves(const char *target) const { return saveList; } -bool AccessMetaEngine::simpleSaveNames() const { return true; } - int AccessMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp index 7031a58ec4..af51f95fe7 100644 --- a/engines/adl/detection.cpp +++ b/engines/adl/detection.cpp @@ -175,7 +175,6 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; int getMaximumSaveSlot() const { return 'O' - 'A'; } SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; void removeSaveState(const char *target, int slot) const; bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; @@ -190,6 +189,7 @@ bool AdlMetaEngine::hasFeature(MetaEngineFeature f) const { case kSavesSupportThumbnail: case kSavesSupportCreationDate: case kSavesSupportPlayTime: + case kSimpleSavesNames: return true; default: return false; @@ -290,8 +290,6 @@ SaveStateList AdlMetaEngine::listSaves(const char *target) const { return saveList; } -bool AdlMetaEngine::simpleSaveNames() const { return true; } - void AdlMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.s%02d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index dc0dbbdddf..5cb239f8d8 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -216,7 +216,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -232,7 +231,8 @@ bool AgiMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } bool AgiBase::hasFeature(EngineFeature f) const { @@ -324,8 +324,6 @@ SaveStateList AgiMetaEngine::listSaves(const char *target) const { return saveList; } -bool AgiMetaEngine::simpleSaveNames() const { return true; } - int AgiMetaEngine::getMaximumSaveSlot() const { return 999; } void AgiMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index dc96eb6ef6..dbc4ee9145 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -120,13 +120,13 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; }; bool AgosMetaEngine::hasFeature(MetaEngineFeature f) const { return - (f == kSupportsListSaves); + (f == kSupportsListSaves) || + (f == kSimpleSavesNames); } bool AGOS::AGOSEngine::hasFeature(EngineFeature f) const { @@ -208,8 +208,6 @@ SaveStateList AgosMetaEngine::listSaves(const char *target) const { return saveList; } -bool AgosMetaEngine::simpleSaveNames() const { return true; } - int AgosMetaEngine::getMaximumSaveSlot() const { return 999; } #if PLUGIN_ENABLED_DYNAMIC(AGOS) diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp index 392d0a027f..def395b77f 100644 --- a/engines/avalanche/detection.cpp +++ b/engines/avalanche/detection.cpp @@ -83,7 +83,6 @@ public: int getMaximumSaveSlot() const { return 99; } SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; }; @@ -100,7 +99,8 @@ bool AvalancheMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsDeleteSave) || (f == kSupportsLoadingDuringStartup) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } SaveStateList AvalancheMetaEngine::listSaves(const char *target) const { @@ -157,8 +157,6 @@ SaveStateList AvalancheMetaEngine::listSaves(const char *target) const { return saveList; } -bool AvalancheMetaEngine::simpleSaveNames() const { return true; } - void AvalancheMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp index 9aca719648..fa735c9ec3 100644 --- a/engines/bbvs/detection.cpp +++ b/engines/bbvs/detection.cpp @@ -86,7 +86,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -98,7 +97,8 @@ bool BbvsMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || - (f == kSavesSupportCreationDate); + (f == kSavesSupportCreationDate) || + (f == kSimpleSavesNames); } void BbvsMetaEngine::removeSaveState(const char *target, int slot) const { @@ -136,8 +136,6 @@ SaveStateList BbvsMetaEngine::listSaves(const char *target) const { return saveList; } -bool BbvsMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor BbvsMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Bbvs::BbvsEngine::getSavegameFilename(target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index eb88b6cd79..0df1e8711e 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -131,7 +131,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -181,7 +180,8 @@ bool CGEMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || - (f == kSavesSupportCreationDate); + (f == kSavesSupportCreationDate) || + (f == kSimpleSavesNames); } void CGEMetaEngine::removeSaveState(const char *target, int slot) const { @@ -240,8 +240,6 @@ SaveStateList CGEMetaEngine::listSaves(const char *target) const { return saveList; } -bool CGEMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor CGEMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(fileName); diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp index d980f82b0d..3701baa40f 100644 --- a/engines/cge2/detection.cpp +++ b/engines/cge2/detection.cpp @@ -127,7 +127,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -186,7 +185,8 @@ bool CGE2MetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || (f == kSupportsListSaves) || - (f == kSupportsLoadingDuringStartup); + (f == kSupportsLoadingDuringStartup) || + (f == kSimpleSavesNames); } int CGE2MetaEngine::getMaximumSaveSlot() const { @@ -240,8 +240,6 @@ SaveStateList CGE2MetaEngine::listSaves(const char *target) const { return saveList; } -bool CGE2MetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor CGE2MetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(fileName); diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 2d10b81473..ec01e8734d 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -104,7 +104,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -174,8 +173,6 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const { return saveList; } -bool CineMetaEngine::simpleSaveNames() const { return false; } - int CineMetaEngine::getMaximumSaveSlot() const { return 9; } void CineMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 9e3ebb5dd5..6f5d236173 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -211,7 +211,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const { return 99; } virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; @@ -255,8 +254,6 @@ SaveStateList CruiseMetaEngine::listSaves(const char *target) const { return saveList; } -bool CruiseMetaEngine::simpleSaveNames() const { return false; } - void CruiseMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Cruise::CruiseEngine::getSavegameFile(slot)); } diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index 8a67981696..65427bd8cd 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -98,7 +98,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const { return 99; } virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; @@ -148,8 +147,6 @@ SaveStateList DraciMetaEngine::listSaves(const char *target) const { return saveList; } -bool DraciMetaEngine::simpleSaveNames() const { return false; } - void DraciMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Draci::DraciEngine::getSavegameFile(slot)); } diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 863ea98786..3bc8069b76 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -326,7 +326,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -340,7 +339,8 @@ bool DrasculaMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } const ExtraGuiOptions DrasculaMetaEngine::getExtraGuiOptions(const Common::String &target) const { @@ -383,8 +383,6 @@ SaveStateList DrasculaMetaEngine::listSaves(const char *target) const { return saveList; } -bool DrasculaMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor DrasculaMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index abe1198233..8e24c44702 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -86,7 +86,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -152,8 +151,6 @@ SaveStateList DreamWebMetaEngine::listSaves(const char *target) const { return saveList; } -bool DreamWebMetaEngine::simpleSaveNames() const { return false; } - int DreamWebMetaEngine::getMaximumSaveSlot() const { return 99; } void DreamWebMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index a183be8a83..6f92f19f24 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -90,7 +90,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const { return 8; } virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; @@ -135,8 +134,6 @@ SaveStateList FullpipeMetaEngine::listSaves(const char *target) const { return saveList; } -bool FullpipeMetaEngine::simpleSaveNames() const { return false; } - void FullpipeMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Fullpipe::getSavegameFile(slot)); } diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp index 523a8b6d1c..d92a037232 100644 --- a/engines/gnap/detection.cpp +++ b/engines/gnap/detection.cpp @@ -78,7 +78,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -90,7 +89,8 @@ bool GnapMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || - (f == kSavesSupportCreationDate); + (f == kSavesSupportCreationDate) || + (f == kSimpleSavesNames); } bool Gnap::GnapEngine::hasFeature(EngineFeature f) const { @@ -142,8 +142,6 @@ SaveStateList GnapMetaEngine::listSaves(const char *target) const { return saveList; } -bool GnapMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor GnapMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(fileName); diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index 22ced10b8a..b12e264a57 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -352,7 +352,6 @@ public: bool hasFeature(MetaEngineFeature f) const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -377,8 +376,6 @@ SaveStateList GroovieMetaEngine::listSaves(const char *target) const { return SaveLoad::listValidSaves(target); } -bool GroovieMetaEngine::simpleSaveNames() const { return false; } - int GroovieMetaEngine::getMaximumSaveSlot() const { return SaveLoad::getMaximumSlot(); } diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp index 84af4fcdf3..041afecaa8 100644 --- a/engines/hopkins/detection.cpp +++ b/engines/hopkins/detection.cpp @@ -117,7 +117,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -129,7 +128,8 @@ bool HopkinsMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } bool Hopkins::HopkinsEngine::hasFeature(EngineFeature f) const { @@ -183,8 +183,6 @@ SaveStateList HopkinsMetaEngine::listSaves(const char *target) const { return saveList; } -bool HopkinsMetaEngine::simpleSaveNames() const { return true; } - int HopkinsMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp index ed67eae416..4e4746c002 100644 --- a/engines/hugo/detection.cpp +++ b/engines/hugo/detection.cpp @@ -149,7 +149,6 @@ public: int getMaximumSaveSlot() const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; void removeSaveState(const char *target, int slot) const; }; @@ -222,8 +221,6 @@ SaveStateList HugoMetaEngine::listSaves(const char *target) const { return saveList; } -bool HugoMetaEngine::simpleSaveNames() const { return false; } - 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); diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 1dcfd08435..70c7e7c93c 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -162,7 +162,6 @@ public: bool hasFeature(MetaEngineFeature f) const; bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -174,7 +173,8 @@ bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const { @@ -274,8 +274,6 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const { return saveList; } -bool KyraMetaEngine::simpleSaveNames() const { return true; } - int KyraMetaEngine::getMaximumSaveSlot() const { return 999; } diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp index 2b2e57df22..bf6d4563b5 100644 --- a/engines/lab/detection.cpp +++ b/engines/lab/detection.cpp @@ -138,7 +138,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -152,7 +151,8 @@ bool LabMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } bool Lab::LabEngine::hasFeature(EngineFeature f) const { @@ -192,8 +192,6 @@ SaveStateList LabMetaEngine::listSaves(const char *target) const { return saveList; } -bool LabMetaEngine::simpleSaveNames() const { return true; } - int LabMetaEngine::getMaximumSaveSlot() const { return 999; } diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 808cea4422..690a358bc3 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -212,7 +212,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -267,8 +266,6 @@ SaveStateList LureMetaEngine::listSaves(const char *target) const { return saveList; } -bool LureMetaEngine::simpleSaveNames() const { return false; } - int LureMetaEngine::getMaximumSaveSlot() const { return 999; } void LureMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp index d5354c4883..4fb8b82eb3 100644 --- a/engines/mads/detection.cpp +++ b/engines/mads/detection.cpp @@ -155,7 +155,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -167,7 +166,8 @@ bool MADSMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } bool MADS::MADSEngine::hasFeature(EngineFeature f) const { @@ -218,8 +218,6 @@ SaveStateList MADSMetaEngine::listSaves(const char *target) const { return saveList; } -bool MADSMetaEngine::simpleSaveNames() const { return true; } - int MADSMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } diff --git a/engines/metaengine.h b/engines/metaengine.h index 6afb122580..568b66ac51 100644 --- a/engines/metaengine.h +++ b/engines/metaengine.h @@ -116,20 +116,6 @@ public: } /** - * Return whether engine's saves could be detected with - * "<target>.###" pattern and "###" corresponds to slot - * number. - * - * If that's not true or engine is using some unusual way - * of detecting saves and slot numbers, this should return - * false. In that case Save/Load dialog would be unavailable - * during cloud saves sync. - * - * @return true, if "<target>.###" is OK for this engine - */ - virtual bool simpleSaveNames() const { return false; } - - /** * Return a list of extra GUI options for the specified target. * If no target is specified, all of the available custom GUI options are * Returned for the plugin (used to set default values). @@ -250,7 +236,19 @@ public: * the game till the save. * This flag may only be set when 'kSavesSupportMetaInfo' is set. */ - kSavesSupportPlayTime + kSavesSupportPlayTime, + + /** + * Feature is available if engine's saves could be detected + * with "<target>.###" pattern and "###" corresponds to slot + * number. + * + * If that's not true or engine is using some unusual way + * of detecting saves and slot numbers, this should be + * unavailable. In that case Save/Load dialog for engine's + * games is locked during cloud saves sync. + */ + kSimpleSavesNames }; /** diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index d3c44a8944..246d3ec3c1 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -200,7 +200,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; SaveStateList listSavesForPrefix(const char *prefix, const char *extension) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const { return 999; } virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -273,8 +272,6 @@ SaveStateList MohawkMetaEngine::listSaves(const char *target) const { return saveList; } -bool MohawkMetaEngine::simpleSaveNames() const { return false; } - void MohawkMetaEngine::removeSaveState(const char *target, int slot) const { // Removing saved games is only supported in Myst/Riven currently. diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp index 2f5a790486..7bc5339179 100644 --- a/engines/mortevielle/detection.cpp +++ b/engines/mortevielle/detection.cpp @@ -72,7 +72,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; }; @@ -91,6 +90,7 @@ bool MortevielleMetaEngine::hasFeature(MetaEngineFeature f) const { case kSavesSupportMetaInfo: case kSavesSupportThumbnail: case kSavesSupportCreationDate: + case kSimpleSavesNames: return true; default: return false; @@ -103,8 +103,6 @@ SaveStateList MortevielleMetaEngine::listSaves(const char *target) const { return Mortevielle::SavegameManager::listSaves(target); } -bool MortevielleMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor MortevielleMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Mortevielle::MortevielleEngine::generateSaveFilename(target, slot); return Mortevielle::SavegameManager::querySaveMetaInfos(filename); diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp index 903c4377e0..0c0347ef13 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -214,7 +214,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -229,7 +228,8 @@ bool NeverhoodMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } bool Neverhood::NeverhoodEngine::hasFeature(EngineFeature f) const { @@ -284,8 +284,6 @@ SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const { return saveList; } -bool NeverhoodMetaEngine::simpleSaveNames() const { return true; } - int NeverhoodMetaEngine::getMaximumSaveSlot() const { return 999; } diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 989fc9dfc8..4c52990874 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -234,7 +234,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -295,8 +294,6 @@ SaveStateList ParallactionMetaEngine::listSaves(const char *target) const { return saveList; } -bool ParallactionMetaEngine::simpleSaveNames() const { return false; } - int ParallactionMetaEngine::getMaximumSaveSlot() const { return 99; } void ParallactionMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp index 54cb4ca525..161a133c8b 100644 --- a/engines/pegasus/detection.cpp +++ b/engines/pegasus/detection.cpp @@ -148,7 +148,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const { return 999; } virtual void removeSaveState(const char *target, int slot) const; }; @@ -179,8 +178,6 @@ SaveStateList PegasusMetaEngine::listSaves(const char *target) const { return saveList; } -bool PegasusMetaEngine::simpleSaveNames() const { return false; } - void PegasusMetaEngine::removeSaveState(const char *target, int slot) const { // See listSaves() for info on the pattern Common::StringArray fileNames = Pegasus::PegasusEngine::listSaveFiles(); diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp index 1c6f63aff3..ad759823d8 100644 --- a/engines/prince/detection.cpp +++ b/engines/prince/detection.cpp @@ -56,7 +56,8 @@ bool PrinceMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || (f == kSupportsListSaves) || - (f == kSupportsLoadingDuringStartup); + (f == kSupportsLoadingDuringStartup) || + (f == kSimpleSavesNames); } bool Prince::PrinceEngine::hasFeature(EngineFeature f) const { diff --git a/engines/prince/detection.h b/engines/prince/detection.h index 39cfdd96e7..3076253cf5 100644 --- a/engines/prince/detection.h +++ b/engines/prince/detection.h @@ -121,7 +121,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; }; diff --git a/engines/prince/saveload.cpp b/engines/prince/saveload.cpp index 2855bdc4bd..d3360badd1 100644 --- a/engines/prince/saveload.cpp +++ b/engines/prince/saveload.cpp @@ -105,8 +105,6 @@ SaveStateList PrinceMetaEngine::listSaves(const char *target) const { return saveList; } -bool PrinceMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor PrinceMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(fileName); diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index 3f8b97ed6a..aed8b7dcb1 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -444,7 +444,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const { return 99; } virtual void removeSaveState(const char *target, int slot) const; @@ -530,8 +529,6 @@ SaveStateList QueenMetaEngine::listSaves(const char *target) const { return saveList; } -bool QueenMetaEngine::simpleSaveNames() const { return false; } - void QueenMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("queen.s%02d", slot); diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index 7f6e0a2485..6fe4277c27 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -144,7 +144,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -158,7 +157,8 @@ bool SagaMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } bool Saga::SagaEngine::hasFeature(EngineFeature f) const { @@ -208,8 +208,6 @@ SaveStateList SagaMetaEngine::listSaves(const char *target) const { return saveList; } -bool SagaMetaEngine::simpleSaveNames() const { return true; } - int SagaMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES - 1; } void SagaMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 08794a0872..ad2b0f31a5 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -518,7 +518,6 @@ public: const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -791,8 +790,6 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const { return saveList; } -bool SciMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int slotNr) const { Common::String fileName = Common::String::format("%s.%03d", target, slotNr); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName); diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 67344e8008..e6740df482 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -960,7 +960,6 @@ public: virtual Common::Error createInstance(OSystem *syst, Engine **engine) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -975,7 +974,8 @@ bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } bool ScummEngine::hasFeature(EngineFeature f) const { @@ -1300,8 +1300,6 @@ SaveStateList ScummMetaEngine::listSaves(const char *target) const { return saveList; } -bool ScummMetaEngine::simpleSaveNames() const { return true; } - void ScummMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = ScummEngine::makeSavegameName(target, slot, false); g_system->getSavefileManager()->removeSavefile(filename); diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp index f54c6db952..c6e632f999 100644 --- a/engines/sherlock/detection.cpp +++ b/engines/sherlock/detection.cpp @@ -159,8 +159,6 @@ public: */ virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; - /** * Returns the maximum number of allowed save slots */ @@ -201,7 +199,8 @@ bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } bool Sherlock::SherlockEngine::hasFeature(EngineFeature f) const { @@ -219,8 +218,6 @@ SaveStateList SherlockMetaEngine::listSaves(const char *target) const { return Sherlock::SaveManager::getSavegameList(target); } -bool SherlockMetaEngine::simpleSaveNames() const { return true; } - int SherlockMetaEngine::getMaximumSaveSlot() const { return MAX_SAVEGAME_SLOTS; } diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 802687b461..d86689e5d7 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -84,7 +84,6 @@ public: virtual Common::Error createInstance(OSystem *syst, Engine **engine) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -248,8 +247,6 @@ SaveStateList SkyMetaEngine::listSaves(const char *target) const { return saveList; } -bool SkyMetaEngine::simpleSaveNames() const { return false; } - int SkyMetaEngine::getMaximumSaveSlot() const { return MAX_SAVE_GAMES; } void SkyMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index d9cc3cda7f..0edf856125 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -91,7 +91,6 @@ public: virtual GameDescriptor findGame(const char *gameid) const; virtual GameList detectGames(const Common::FSList &fslist) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -264,8 +263,6 @@ SaveStateList SwordMetaEngine::listSaves(const char *target) const { return saveList; } -bool SwordMetaEngine::simpleSaveNames() const { return false; } - int SwordMetaEngine::getMaximumSaveSlot() const { return 999; } void SwordMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 3213a26e4c..4f3caa437e 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -97,7 +97,6 @@ public: virtual GameDescriptor findGame(const char *gameid) const; virtual GameList detectGames(const Common::FSList &fslist) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; @@ -108,7 +107,8 @@ bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || - (f == kSupportsDeleteSave); + (f == kSupportsDeleteSave) || + (f == kSimpleSavesNames); } bool Sword2::Sword2Engine::hasFeature(EngineFeature f) const { @@ -257,8 +257,6 @@ SaveStateList Sword2MetaEngine::listSaves(const char *target) const { return saveList; } -bool Sword2MetaEngine::simpleSaveNames() const { return true; } - int Sword2MetaEngine::getMaximumSaveSlot() const { return 999; } void Sword2MetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index 1c4544c76a..c5f55b5a26 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -69,7 +69,6 @@ public: virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const; virtual int getMaximumSaveSlot() const { return Sword25::PersistenceService::getSlotCount(); } virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; }; bool Sword25MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { @@ -110,8 +109,6 @@ SaveStateList Sword25MetaEngine::listSaves(const char *target) const { return saveList; } -bool Sword25MetaEngine::simpleSaveNames() const { return false; } - #if PLUGIN_ENABLED_DYNAMIC(SWORD25) REGISTER_PLUGIN_DYNAMIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngine); #else diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index a8d32e89d4..caa7bdbec9 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -149,8 +149,6 @@ public: return saveList; } - virtual bool simpleSaveNames() const { return false; } - virtual int getMaximumSaveSlot() const { return MAX_SAVES - 1; } diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 7d8b54e5db..d6bcfe5ea0 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -101,7 +101,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -110,7 +109,8 @@ bool TinselMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || - (f == kSupportsDeleteSave); + (f == kSupportsDeleteSave) || + (f == kSimpleSavesNames); } bool Tinsel::TinselEngine::hasFeature(EngineFeature f) const { @@ -165,8 +165,6 @@ SaveStateList TinselMetaEngine::listSaves(const char *target) const { return saveList; } -bool TinselMetaEngine::simpleSaveNames() const { return true; } - bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Tinsel::TinselGameDescription *gd = (const Tinsel::TinselGameDescription *)desc; if (gd) { diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp index 8da9106931..cc27341e10 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -221,7 +221,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -235,7 +234,8 @@ bool ToltecsMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime); + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); } bool Toltecs::ToltecsEngine::hasFeature(EngineFeature f) const { @@ -289,8 +289,6 @@ SaveStateList ToltecsMetaEngine::listSaves(const char *target) const { return saveList; } -bool ToltecsMetaEngine::simpleSaveNames() const { return true; } - int ToltecsMetaEngine::getMaximumSaveSlot() const { return 999; } diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp index 5dda4c7caf..ec0b3e186b 100644 --- a/engines/tony/detection.cpp +++ b/engines/tony/detection.cpp @@ -82,7 +82,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -142,8 +141,6 @@ SaveStateList TonyMetaEngine::listSaves(const char *target) const { return saveList; } -bool TonyMetaEngine::simpleSaveNames() const { return false; } - int TonyMetaEngine::getMaximumSaveSlot() const { return 99; } diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index eac91a5595..e93d676d87 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -148,7 +148,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual int getMaximumSaveSlot() const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -160,7 +159,8 @@ bool ToonMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || - (f == kSavesSupportCreationDate); + (f == kSavesSupportCreationDate) || + (f == kSimpleSavesNames); } void ToonMetaEngine::removeSaveState(const char *target, int slot) const { @@ -213,8 +213,6 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const { return saveList; } -bool ToonMetaEngine::simpleSaveNames() const { return true; } - SaveStateDescriptor ToonMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(fileName); diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index e2737d4f2c..dcb58ffae6 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -155,7 +155,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -211,8 +210,6 @@ SaveStateList ToucheMetaEngine::listSaves(const char *target) const { return saveList; } -bool ToucheMetaEngine::simpleSaveNames() const { return false; } - int ToucheMetaEngine::getMaximumSaveSlot() const { return Touche::kMaxSaveStates - 1; } diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index 716ac4af53..e476391f71 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -95,6 +95,7 @@ public: case kSavesSupportThumbnail: case kSavesSupportCreationDate: case kSavesSupportPlayTime: + case kSimpleSavesNames: return true; default: return false; @@ -145,8 +146,6 @@ public: return saveList; } - virtual bool simpleSaveNames() const { return true; } - virtual int getMaximumSaveSlot() const { return MAX_SAVES - 1; } diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index 227924cd28..2447e15d6b 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -187,8 +187,6 @@ public: return saveList; } - virtual bool simpleSaveNames() const { return false; } - virtual int getMaximumSaveSlot() const { return Tucker::kLastSaveSlot; } diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp index 76668eb370..eefe174e94 100644 --- a/engines/voyeur/detection.cpp +++ b/engines/voyeur/detection.cpp @@ -81,7 +81,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -93,7 +92,8 @@ bool VoyeurMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail); + (f == kSavesSupportThumbnail) || + (f == kSimpleSavesNames); } bool Voyeur::VoyeurEngine::hasFeature(EngineFeature f) const { @@ -144,8 +144,6 @@ SaveStateList VoyeurMetaEngine::listSaves(const char *target) const { return saveList; } -bool VoyeurMetaEngine::simpleSaveNames() const { return true; } - int VoyeurMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp index 1069d740f6..778cd3c7a7 100644 --- a/engines/wage/detection.cpp +++ b/engines/wage/detection.cpp @@ -70,7 +70,6 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; virtual bool hasFeature(MetaEngineFeature f) const; virtual SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; virtual void removeSaveState(const char *target, int slot) const; }; @@ -79,7 +78,8 @@ bool WageMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || - (f == kSupportsDeleteSave); + (f == kSupportsDeleteSave) || + (f == kSimpleSavesNames); } bool Wage::WageEngine::hasFeature(EngineFeature f) const { @@ -137,8 +137,6 @@ SaveStateList WageMetaEngine::listSaves(const char *target) const { return saveList; } -bool WageMetaEngine::simpleSaveNames() const { return true; } - int WageMetaEngine::getMaximumSaveSlot() const { return 999; } void WageMetaEngine::removeSaveState(const char *target, int slot) const { diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index f225cd3930..4e8eab505f 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -164,8 +164,6 @@ public: return saves; } - virtual bool simpleSaveNames() const { return false; } - int getMaximumSaveSlot() const { return 100; } diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp index 05dfb8b8d0..5e535a9954 100644 --- a/engines/zvision/detection.cpp +++ b/engines/zvision/detection.cpp @@ -75,7 +75,6 @@ public: virtual bool hasFeature(MetaEngineFeature f) const; virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const; SaveStateList listSaves(const char *target) const; - virtual bool simpleSaveNames() const; virtual int getMaximumSaveSlot() const; void removeSaveState(const char *target, int slot) const; SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; @@ -88,7 +87,8 @@ bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail) || - (f == kSavesSupportCreationDate); + (f == kSavesSupportCreationDate) || + (f == kSimpleSavesNames); //(f == kSavesSupportPlayTime); } @@ -160,8 +160,6 @@ SaveStateList ZVisionMetaEngine::listSaves(const char *target) const { return saveList; } -bool ZVisionMetaEngine::simpleSaveNames() const { return true; } - int ZVisionMetaEngine::getMaximumSaveSlot() const { return 999; } |