diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp index 173b3ea8c73..af443fbb453 100644 --- a/engines/access/detection.cpp +++ b/engines/access/detection.cpp @@ -32,9 +32,9 @@ static const PlainGameDescriptor AccessGames[] = { #include "access/detection_tables.h" -class AccessMetaEngine : public AdvancedMetaEngine { +class AccessMetaEngineStatic : public AdvancedMetaEngineStatic { public: - AccessMetaEngine() : AdvancedMetaEngine(Access::gameDescriptions, sizeof(Access::AccessGameDescription), AccessGames) { + AccessMetaEngineStatic() : AdvancedMetaEngineStatic(Access::gameDescriptions, sizeof(Access::AccessGameDescription), AccessGames) { _maxScanDepth = 3; } @@ -52,4 +52,4 @@ public: }; -REGISTER_PLUGIN_STATIC(ACCESS_DETECTION, PLUGIN_TYPE_METAENGINE, AccessMetaEngine); +REGISTER_PLUGIN_STATIC(ACCESS_DETECTION, PLUGIN_TYPE_METAENGINE, AccessMetaEngineStatic); diff --git a/engines/access/metaengine.cpp b/engines/access/metaengine.cpp index 3ed66d49f12..662c7e6617f 100644 --- a/engines/access/metaengine.cpp +++ b/engines/access/metaengine.cpp @@ -68,7 +68,7 @@ Common::Platform AccessEngine::getPlatform() const { } // End of namespace Access -class AccessMetaEngineConnect : public AdvancedMetaEngineConnect { +class AccessMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "access"; @@ -84,7 +84,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool AccessMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool AccessMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -101,7 +101,7 @@ bool Access::AccessEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool AccessMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool AccessMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Access::AccessGameDescription *gd = (const Access::AccessGameDescription *)desc; if (gd) { switch (gd->gameID) { @@ -118,7 +118,7 @@ bool AccessMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con return gd != 0; } -SaveStateList AccessMetaEngineConnect::listSaves(const char *target) const { +SaveStateList AccessMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -149,16 +149,16 @@ SaveStateList AccessMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int AccessMetaEngineConnect::getMaximumSaveSlot() const { +int AccessMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void AccessMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void AccessMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor AccessMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor AccessMetaEngine::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); @@ -185,7 +185,7 @@ SaveStateDescriptor AccessMetaEngineConnect::querySaveMetaInfos(const char *targ } #if PLUGIN_ENABLED_DYNAMIC(ACCESS) - REGISTER_PLUGIN_DYNAMIC(ACCESS, PLUGIN_TYPE_ENGINE, AccessMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(ACCESS, PLUGIN_TYPE_ENGINE, AccessMetaEngine); #else - REGISTER_PLUGIN_STATIC(ACCESS, PLUGIN_TYPE_ENGINE, AccessMetaEngineConnect); + REGISTER_PLUGIN_STATIC(ACCESS, PLUGIN_TYPE_ENGINE, AccessMetaEngine); #endif diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp index 11603e231b6..7c71801acb7 100644 --- a/engines/adl/detection.cpp +++ b/engines/adl/detection.cpp @@ -337,9 +337,9 @@ static const AdlGameDescription gameDiskDescriptions[] = { { AD_TABLE_END_MARKER, GAME_TYPE_NONE, GAME_VER_NONE } }; -class AdlMetaEngine : public AdvancedMetaEngine { +class AdlMetaEngineStatic : public AdvancedMetaEngineStatic { public: - AdlMetaEngine() : AdvancedMetaEngine(gameFileDescriptions, sizeof(AdlGameDescription), adlGames, optionsList) { } + AdlMetaEngineStatic() : AdvancedMetaEngineStatic(gameFileDescriptions, sizeof(AdlGameDescription), adlGames, optionsList) { } const char *getName() const override { return "ADL"; @@ -358,7 +358,7 @@ public: bool addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const; }; -bool AdlMetaEngine::addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const { +bool AdlMetaEngineStatic::addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const { if (filePropsMap.contains(fname)) return true; @@ -377,9 +377,9 @@ bool AdlMetaEngine::addFileProps(const FileMap &allFiles, Common::String fname, } // Based on AdvancedMetaEngine::detectGame -ADDetectedGames AdlMetaEngine::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const { +ADDetectedGames AdlMetaEngineStatic::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const { // We run the file-based detector first, if it finds a match we do not search for disk images - ADDetectedGames matched = AdvancedMetaEngine::detectGame(parent, allFiles, language, platform, extra); + ADDetectedGames matched = AdvancedMetaEngineStatic::detectGame(parent, allFiles, language, platform, extra); if (!matched.empty()) return matched; @@ -474,4 +474,4 @@ ADDetectedGames AdlMetaEngine::detectGame(const Common::FSNode &parent, const Fi } // End of namespace Adl -REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_METAENGINE, Adl::AdlMetaEngine); +REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_METAENGINE, Adl::AdlMetaEngineStatic); diff --git a/engines/adl/metaengine.cpp b/engines/adl/metaengine.cpp index a479c5ef1fc..daa38dfcf6c 100644 --- a/engines/adl/metaengine.cpp +++ b/engines/adl/metaengine.cpp @@ -67,7 +67,7 @@ Common::Platform getPlatform(const AdlGameDescription &adlDesc) { return adlDesc.desc.platform; } -class AdlMetaEngineConnect : public AdvancedMetaEngineConnect { +class AdlMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "adl"; @@ -82,7 +82,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override; }; -bool AdlMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool AdlMetaEngine::hasFeature(MetaEngineFeature f) const { switch(f) { case kSupportsListSaves: case kSupportsLoadingDuringStartup: @@ -98,7 +98,7 @@ bool AdlMetaEngineConnect::hasFeature(MetaEngineFeature f) const { } } -SaveStateDescriptor AdlMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor AdlMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.s%02d", target, slot); Common::InSaveFile *inFile = g_system->getSavefileManager()->openForLoading(fileName); @@ -155,7 +155,7 @@ SaveStateDescriptor AdlMetaEngineConnect::querySaveMetaInfos(const char *target, return sd; } -SaveStateList AdlMetaEngineConnect::listSaves(const char *target) const { +SaveStateList AdlMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray files = saveFileMan->listSavefiles(Common::String(target) + ".s##"); @@ -196,7 +196,7 @@ SaveStateList AdlMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void AdlMetaEngineConnect::removeSaveState(const char *target, int slot) const { +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); } @@ -209,7 +209,7 @@ Engine *HiRes4Engine_create(OSystem *syst, const AdlGameDescription *gd); Engine *HiRes5Engine_create(OSystem *syst, const AdlGameDescription *gd); Engine *HiRes6Engine_create(OSystem *syst, const AdlGameDescription *gd); -bool AdlMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { +bool AdlMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (!gd) return false; @@ -247,8 +247,8 @@ bool AdlMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } // End of namespace Adl #if PLUGIN_ENABLED_DYNAMIC(ADL) - REGISTER_PLUGIN_DYNAMIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngine); #else - REGISTER_PLUGIN_STATIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngineConnect); + REGISTER_PLUGIN_STATIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngine); #endif diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index e3a87feb1e6..c72953afaf0 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -131,12 +131,12 @@ static const ADExtraGuiOptionsMap optionsList[] = { using namespace Agi; -class AgiMetaEngine : public AdvancedMetaEngine { +class AgiMetaEngineStatic : public AdvancedMetaEngineStatic { mutable Common::String _gameid; mutable Common::String _extra; public: - AgiMetaEngine() : AdvancedMetaEngine(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) { + AgiMetaEngineStatic() : AdvancedMetaEngineStatic(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) { _guiOptions = GUIO1(GUIO_NOSPEECH); } @@ -155,7 +155,7 @@ public: ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override; }; -ADDetectedGame AgiMetaEngine::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const { +ADDetectedGame AgiMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const { typedef Common::HashMap IntMap; IntMap allFiles; bool matchedUsingFilenames = false; @@ -323,4 +323,4 @@ ADDetectedGame AgiMetaEngine::fallbackDetect(const FileMap &allFilesXXX, const C return ADDetectedGame(); } -REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_METAENGINE, AgiMetaEngine); +REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_METAENGINE, AgiMetaEngineStatic); diff --git a/engines/agi/metaengine.cpp b/engines/agi/metaengine.cpp index f2507a8f375..3811371c8b2 100644 --- a/engines/agi/metaengine.cpp +++ b/engines/agi/metaengine.cpp @@ -106,7 +106,7 @@ bool AgiBase::hasFeature(EngineFeature f) const { using namespace Agi; -class AgiMetaEngineConnect : public AdvancedMetaEngineConnect { +class AgiMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "agi"; @@ -122,7 +122,7 @@ public: bool hasFeature(MetaEngineFeature f) const override; }; -bool AgiMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool AgiMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -134,7 +134,7 @@ bool AgiMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -bool AgiMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool AgiMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Agi::AGIGameDescription *gd = (const Agi::AGIGameDescription *)desc; bool res = true; @@ -169,7 +169,7 @@ bool AgiMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return res; } -SaveStateList AgiMetaEngineConnect::listSaves(const char *target) const { +SaveStateList AgiMetaEngine::listSaves(const char *target) const { const uint32 AGIflag = MKTAG('A', 'G', 'I', ':'); Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; @@ -219,14 +219,14 @@ SaveStateList AgiMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void AgiMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void AgiMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int AgiMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int AgiMetaEngine::getMaximumSaveSlot() const { return 999; } -SaveStateDescriptor AgiMetaEngineConnect::querySaveMetaInfos(const char *target, int slotNr) const { +SaveStateDescriptor AgiMetaEngine::querySaveMetaInfos(const char *target, int slotNr) const { const uint32 AGIflag = MKTAG('A', 'G', 'I', ':'); Common::String fileName = Common::String::format("%s.%03d", target, slotNr); @@ -317,9 +317,9 @@ SaveStateDescriptor AgiMetaEngineConnect::querySaveMetaInfos(const char *target, } #if PLUGIN_ENABLED_DYNAMIC(AGI) - REGISTER_PLUGIN_DYNAMIC(AGI, PLUGIN_TYPE_ENGINE, AgiMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(AGI, PLUGIN_TYPE_ENGINE, AgiMetaEngine); #else - REGISTER_PLUGIN_STATIC(AGI, PLUGIN_TYPE_ENGINE, AgiMetaEngineConnect); + REGISTER_PLUGIN_STATIC(AGI, PLUGIN_TYPE_ENGINE, AgiMetaEngine); #endif namespace Agi { diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 6626c980e7b..9fea140ac3d 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -65,9 +65,9 @@ static const char *const directoryGlobs[] = { using namespace AGOS; -class AgosMetaEngine : public AdvancedMetaEngine { +class AgosMetaEngineStatic : public AdvancedMetaEngineStatic { public: - AgosMetaEngine() : AdvancedMetaEngine(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { + AgosMetaEngineStatic() : AdvancedMetaEngineStatic(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) { _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; @@ -90,4 +90,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(AGOS_DETECTION, PLUGIN_TYPE_METAENGINE, AgosMetaEngine); +REGISTER_PLUGIN_STATIC(AGOS_DETECTION, PLUGIN_TYPE_METAENGINE, AgosMetaEngineStatic); diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp index 7bac1561187..98655c22aaf 100644 --- a/engines/agos/metaengine.cpp +++ b/engines/agos/metaengine.cpp @@ -33,7 +33,7 @@ #include "agos/detection.h" #include "agos/obsolete.h" -class AgosMetaEngineConnect : public AdvancedMetaEngineConnect { +class AgosMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "agos"; @@ -43,7 +43,7 @@ public: Common::Error createInstance(OSystem *syst, Engine **engine) const override { Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable); - return AdvancedMetaEngineConnect::createInstance(syst, engine); + return AdvancedMetaEngine::createInstance(syst, engine); } bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; @@ -51,7 +51,7 @@ public: int getMaximumSaveSlot() const override; }; -bool AgosMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool AgosMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSimpleSavesNames); @@ -62,7 +62,7 @@ bool AGOS::AGOSEngine::hasFeature(EngineFeature f) const { (f == kSupportsReturnToLauncher); } -bool AgosMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const AGOS::AGOSGameDescription *gd = (const AGOS::AGOSGameDescription *)desc; bool res = true; @@ -107,7 +107,7 @@ bool AgosMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return res; } -SaveStateList AgosMetaEngineConnect::listSaves(const char *target) const { +SaveStateList AgosMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -136,12 +136,12 @@ SaveStateList AgosMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int AgosMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int AgosMetaEngine::getMaximumSaveSlot() const { return 999; } #if PLUGIN_ENABLED_DYNAMIC(AGOS) - REGISTER_PLUGIN_DYNAMIC(AGOS, PLUGIN_TYPE_ENGINE, AgosMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(AGOS, PLUGIN_TYPE_ENGINE, AgosMetaEngine); #else - REGISTER_PLUGIN_STATIC(AGOS, PLUGIN_TYPE_ENGINE, AgosMetaEngineConnect); + REGISTER_PLUGIN_STATIC(AGOS, PLUGIN_TYPE_ENGINE, AgosMetaEngine); #endif namespace AGOS { diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp index d6baf0f64e5..4c9552a0d32 100644 --- a/engines/avalanche/detection.cpp +++ b/engines/avalanche/detection.cpp @@ -56,9 +56,9 @@ static const ADGameDescription gameDescriptions[] = { AD_TABLE_END_MARKER }; -class AvalancheMetaEngine : public AdvancedMetaEngine { +class AvalancheMetaEngineStatic : public AdvancedMetaEngineStatic { public: - AvalancheMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(AvalancheGameDescription), avalancheGames) { + AvalancheMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(AvalancheGameDescription), avalancheGames) { } const char *getEngineId() const override { @@ -76,4 +76,4 @@ public: } // End of namespace Avalanche -REGISTER_PLUGIN_STATIC(AVALANCHE_DETECTION, PLUGIN_TYPE_METAENGINE, Avalanche::AvalancheMetaEngine); +REGISTER_PLUGIN_STATIC(AVALANCHE_DETECTION, PLUGIN_TYPE_METAENGINE, Avalanche::AvalancheMetaEngineStatic); diff --git a/engines/avalanche/metaengine.cpp b/engines/avalanche/metaengine.cpp index f004c89964b..51ff2dea278 100644 --- a/engines/avalanche/metaengine.cpp +++ b/engines/avalanche/metaengine.cpp @@ -54,7 +54,7 @@ Common::Platform AvalancheEngine::getPlatform() const { namespace Avalanche { -class AvalancheMetaEngineConnect : public AdvancedMetaEngineConnect { +class AvalancheMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "avalanche"; @@ -69,13 +69,13 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool AvalancheMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { +bool AvalancheMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) *engine = new AvalancheEngine(syst, (const AvalancheGameDescription *)gd); return gd != 0; } -bool AvalancheMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool AvalancheMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -85,7 +85,7 @@ bool AvalancheMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -SaveStateList AvalancheMetaEngineConnect::listSaves(const char *target) const { +SaveStateList AvalancheMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -139,12 +139,12 @@ SaveStateList AvalancheMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void AvalancheMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void AvalancheMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -SaveStateDescriptor AvalancheMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor AvalancheMetaEngine::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); @@ -192,7 +192,7 @@ SaveStateDescriptor AvalancheMetaEngineConnect::querySaveMetaInfos(const char *t } // End of namespace Avalanche #if PLUGIN_ENABLED_DYNAMIC(AVALANCHE) - REGISTER_PLUGIN_DYNAMIC(AVALANCHE, PLUGIN_TYPE_ENGINE, Avalanche::AvalancheMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(AVALANCHE, PLUGIN_TYPE_ENGINE, Avalanche::AvalancheMetaEngine); #else - REGISTER_PLUGIN_STATIC(AVALANCHE, PLUGIN_TYPE_ENGINE, Avalanche::AvalancheMetaEngineConnect); + REGISTER_PLUGIN_STATIC(AVALANCHE, PLUGIN_TYPE_ENGINE, Avalanche::AvalancheMetaEngine); #endif diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp index 4b50e7ce7d9..33d28c6bfc1 100644 --- a/engines/bbvs/detection.cpp +++ b/engines/bbvs/detection.cpp @@ -83,9 +83,9 @@ static const char * const directoryGlobs[] = { 0 }; -class BbvsMetaEngine : public AdvancedMetaEngine { +class BbvsMetaEngineStatic : public AdvancedMetaEngineStatic { public: - BbvsMetaEngine() : AdvancedMetaEngine(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) { + BbvsMetaEngineStatic() : AdvancedMetaEngineStatic(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) { _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } @@ -103,4 +103,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_METAENGINE, BbvsMetaEngine); +REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_METAENGINE, BbvsMetaEngineStatic); diff --git a/engines/bbvs/metaengine.cpp b/engines/bbvs/metaengine.cpp index c888af3fe5b..ca070f4cacb 100644 --- a/engines/bbvs/metaengine.cpp +++ b/engines/bbvs/metaengine.cpp @@ -37,7 +37,7 @@ bool BbvsEngine::isLoogieDemo() const { } // End of namespace Bbvs -class BbvsMetaEngineConnect : public AdvancedMetaEngineConnect { +class BbvsMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "bbvs"; @@ -52,7 +52,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool BbvsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool BbvsMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -63,16 +63,16 @@ bool BbvsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -void BbvsMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void BbvsMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int BbvsMetaEngineConnect::getMaximumSaveSlot() const { +int BbvsMetaEngine::getMaximumSaveSlot() const { return 999; } -SaveStateList BbvsMetaEngineConnect::listSaves(const char *target) const { +SaveStateList BbvsMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Bbvs::BbvsEngine::SaveHeader header; Common::String pattern = target; @@ -98,7 +98,7 @@ SaveStateList BbvsMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor BbvsMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +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()); if (in) { @@ -121,7 +121,7 @@ SaveStateDescriptor BbvsMetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -bool BbvsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool BbvsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Bbvs::BbvsEngine(syst, desc); } @@ -129,7 +129,7 @@ bool BbvsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(BBVS) - REGISTER_PLUGIN_DYNAMIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngine); #else - REGISTER_PLUGIN_STATIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngineConnect); + REGISTER_PLUGIN_STATIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngine); #endif diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp index ecef2d5b34f..5c0bec1af22 100644 --- a/engines/bladerunner/detection.cpp +++ b/engines/bladerunner/detection.cpp @@ -92,32 +92,32 @@ static const ADExtraGuiOptionsMap optionsList[] = { } // End of namespace BladeRunner -class BladeRunnerMetaEngine : public AdvancedMetaEngine { +class BladeRunnerMetaEngineStatic : public AdvancedMetaEngineStatic { public: - BladeRunnerMetaEngine(); + BladeRunnerMetaEngineStatic(); const char *getEngineId() const override; const char *getName() const override; const char *getOriginalCopyright() const override; }; -BladeRunnerMetaEngine::BladeRunnerMetaEngine() - : AdvancedMetaEngine( +BladeRunnerMetaEngineStatic::BladeRunnerMetaEngineStatic() + : AdvancedMetaEngineStatic( BladeRunner::gameDescriptions, sizeof(BladeRunner::gameDescriptions[0]), BladeRunner::bladeRunnerGames, BladeRunner::optionsList) {} -const char *BladeRunnerMetaEngine::getEngineId() const { +const char *BladeRunnerMetaEngineStatic::getEngineId() const { return "bladerunner"; } -const char *BladeRunnerMetaEngine::getName() const { +const char *BladeRunnerMetaEngineStatic::getName() const { return "Blade Runner"; } -const char *BladeRunnerMetaEngine::getOriginalCopyright() const { +const char *BladeRunnerMetaEngineStatic::getOriginalCopyright() const { return "Blade Runner (C) 1997 Westwood Studios"; } -REGISTER_PLUGIN_STATIC(BLADERUNNER_DETECTION, PLUGIN_TYPE_METAENGINE, BladeRunnerMetaEngine); +REGISTER_PLUGIN_STATIC(BLADERUNNER_DETECTION, PLUGIN_TYPE_METAENGINE, BladeRunnerMetaEngineStatic); diff --git a/engines/bladerunner/metaengine.cpp b/engines/bladerunner/metaengine.cpp index 46d7da01e13..00be0f73c22 100644 --- a/engines/bladerunner/metaengine.cpp +++ b/engines/bladerunner/metaengine.cpp @@ -32,7 +32,7 @@ #include "engines/advancedDetector.h" -class BladeRunnerMetaEngineConnect : public AdvancedMetaEngineConnect { +class BladeRunnerMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override; @@ -45,17 +45,17 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -const char *BladeRunnerMetaEngineConnect::getName() const { +const char *BladeRunnerMetaEngine::getName() const { return "bladerunner"; } -bool BladeRunnerMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool BladeRunnerMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { *engine = new BladeRunner::BladeRunnerEngine(syst, desc); return true; } -bool BladeRunnerMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool BladeRunnerMetaEngine::hasFeature(MetaEngineFeature f) const { return f == kSupportsListSaves || f == kSupportsLoadingDuringStartup || @@ -67,24 +67,24 @@ bool BladeRunnerMetaEngineConnect::hasFeature(MetaEngineFeature f) const { f == kSimpleSavesNames; } -SaveStateList BladeRunnerMetaEngineConnect::listSaves(const char *target) const { +SaveStateList BladeRunnerMetaEngine::listSaves(const char *target) const { return BladeRunner::SaveFileManager::list(target); } -int BladeRunnerMetaEngineConnect::getMaximumSaveSlot() const { +int BladeRunnerMetaEngine::getMaximumSaveSlot() const { return 999; } -void BladeRunnerMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void BladeRunnerMetaEngine::removeSaveState(const char *target, int slot) const { BladeRunner::SaveFileManager::remove(target, slot); } -SaveStateDescriptor BladeRunnerMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor BladeRunnerMetaEngine::querySaveMetaInfos(const char *target, int slot) const { return BladeRunner::SaveFileManager::queryMetaInfos(target, slot); } #if PLUGIN_ENABLED_DYNAMIC(BLADERUNNER) - REGISTER_PLUGIN_DYNAMIC(BLADERUNNER, PLUGIN_TYPE_ENGINE, BladeRunnerMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(BLADERUNNER, PLUGIN_TYPE_ENGINE, BladeRunnerMetaEngine); #else - REGISTER_PLUGIN_STATIC(BLADERUNNER, PLUGIN_TYPE_ENGINE, BladeRunnerMetaEngineConnect); + REGISTER_PLUGIN_STATIC(BLADERUNNER, PLUGIN_TYPE_ENGINE, BladeRunnerMetaEngine); #endif diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index 92288b2e59f..1d8d433863b 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -120,9 +120,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class CGEMetaEngine : public AdvancedMetaEngine { +class CGEMetaEngineStatic : public AdvancedMetaEngineStatic { public: - CGEMetaEngine() : AdvancedMetaEngine(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) { + CGEMetaEngineStatic() : AdvancedMetaEngineStatic(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) { } const char *getEngineId() const override { @@ -155,19 +155,19 @@ static const ADFileBasedFallback fileBasedFallback[] = { { 0, { 0 } } }; -ADDetectedGame CGEMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame CGEMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { ADDetectedGame game = detectGameFilebased(allFiles, CGE::fileBasedFallback); if (!game.desc) return ADDetectedGame(); - SearchMan.addDirectory("CGEMetaEngine::fallbackDetect", fslist.begin()->getParent()); + SearchMan.addDirectory("CGEMetaEngineStatic::fallbackDetect", fslist.begin()->getParent()); ResourceManager *resman; resman = new ResourceManager(); bool sayFileFound = resman->exist("CGE.SAY"); delete resman; - SearchMan.remove("CGEMetaEngine::fallbackDetect"); + SearchMan.remove("CGEMetaEngineStatic::fallbackDetect"); if (!sayFileFound) return ADDetectedGame(); @@ -177,4 +177,4 @@ ADDetectedGame CGEMetaEngine::fallbackDetect(const FileMap &allFiles, const Comm } // End of namespace CGE -REGISTER_PLUGIN_STATIC(CGE_DETECTION, PLUGIN_TYPE_METAENGINE, CGE::CGEMetaEngine); +REGISTER_PLUGIN_STATIC(CGE_DETECTION, PLUGIN_TYPE_METAENGINE, CGE::CGEMetaEngineStatic); diff --git a/engines/cge/metaengine.cpp b/engines/cge/metaengine.cpp index b080e1b1fff..ae9a613c287 100644 --- a/engines/cge/metaengine.cpp +++ b/engines/cge/metaengine.cpp @@ -31,7 +31,7 @@ namespace CGE { -class CGEMetaEngineConnect : public AdvancedMetaEngineConnect { +class CGEMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "cge"; @@ -47,7 +47,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool CGEMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool CGEMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -59,16 +59,16 @@ bool CGEMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -void CGEMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void CGEMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int CGEMetaEngineConnect::getMaximumSaveSlot() const { +int CGEMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList CGEMetaEngineConnect::listSaves(const char *target) const { +SaveStateList CGEMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -111,7 +111,7 @@ SaveStateList CGEMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor CGEMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +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); @@ -153,7 +153,7 @@ SaveStateDescriptor CGEMetaEngineConnect::querySaveMetaInfos(const char *target, return SaveStateDescriptor(); } -bool CGEMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool CGEMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new CGE::CGEEngine(syst, desc); } @@ -163,7 +163,7 @@ bool CGEMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } // End of namespace CGE #if PLUGIN_ENABLED_DYNAMIC(CGE) -REGISTER_PLUGIN_DYNAMIC(CGE, PLUGIN_TYPE_ENGINE, CGE::CGEMetaEngineConnect); +REGISTER_PLUGIN_DYNAMIC(CGE, PLUGIN_TYPE_ENGINE, CGE::CGEMetaEngine); #else -REGISTER_PLUGIN_STATIC(CGE, PLUGIN_TYPE_ENGINE, CGE::CGEMetaEngineConnect); +REGISTER_PLUGIN_STATIC(CGE, PLUGIN_TYPE_ENGINE, CGE::CGEMetaEngine); #endif diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp index 9807efad9b5..ddf6ee8bfde 100644 --- a/engines/cge2/detection.cpp +++ b/engines/cge2/detection.cpp @@ -116,9 +116,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class CGE2MetaEngine : public AdvancedMetaEngine { +class CGE2MetaEngineStatic : public AdvancedMetaEngineStatic { public: - CGE2MetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) { + CGE2MetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) { } const char *getEngineId() const override { @@ -153,19 +153,19 @@ static const ADFileBasedFallback fileBasedFallback[] = { // This fallback detection looks identical to the one used for CGE. In fact, the difference resides // in the ResourceManager which handles a different archive format. The rest of the detection is identical. -ADDetectedGame CGE2MetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame CGE2MetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { ADDetectedGame game = detectGameFilebased(allFiles, CGE2::fileBasedFallback); if (!game.desc) return ADDetectedGame(); - SearchMan.addDirectory("CGE2MetaEngine::fallbackDetect", fslist.begin()->getParent()); + SearchMan.addDirectory("CGE2MetaEngineStatic::fallbackDetect", fslist.begin()->getParent()); ResourceManager *resman; resman = new ResourceManager(); bool sayFileFound = resman->exist("CGE.SAY"); delete resman; - SearchMan.remove("CGE2MetaEngine::fallbackDetect"); + SearchMan.remove("CGE2MetaEngineStatic::fallbackDetect"); if (!sayFileFound) return ADDetectedGame(); @@ -175,4 +175,4 @@ ADDetectedGame CGE2MetaEngine::fallbackDetect(const FileMap &allFiles, const Com } // End of namespace CGE2 -REGISTER_PLUGIN_STATIC(CGE2_DETECTION, PLUGIN_TYPE_METAENGINE, CGE2::CGE2MetaEngine); +REGISTER_PLUGIN_STATIC(CGE2_DETECTION, PLUGIN_TYPE_METAENGINE, CGE2::CGE2MetaEngineStatic); diff --git a/engines/cge2/metaengine.cpp b/engines/cge2/metaengine.cpp index 31b2f634441..bd3cdf68d71 100644 --- a/engines/cge2/metaengine.cpp +++ b/engines/cge2/metaengine.cpp @@ -33,7 +33,7 @@ namespace CGE2 { -class CGE2MetaEngineConnect : public AdvancedMetaEngineConnect { +class CGE2MetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "cge2"; @@ -47,14 +47,14 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool CGE2MetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool CGE2MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new CGE2::CGE2Engine(syst, desc); return desc != 0; } -bool CGE2MetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool CGE2MetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || @@ -66,11 +66,11 @@ bool CGE2MetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -int CGE2MetaEngineConnect::getMaximumSaveSlot() const { +int CGE2MetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList CGE2MetaEngineConnect::listSaves(const char *target) const { +SaveStateList CGE2MetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -113,7 +113,7 @@ SaveStateList CGE2MetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor CGE2MetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +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); @@ -155,7 +155,7 @@ SaveStateDescriptor CGE2MetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -void CGE2MetaEngineConnect::removeSaveState(const char *target, int slot) const { +void CGE2MetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } @@ -163,7 +163,7 @@ void CGE2MetaEngineConnect::removeSaveState(const char *target, int slot) const } // End of namespace CGE2 #if PLUGIN_ENABLED_DYNAMIC(CGE2) - REGISTER_PLUGIN_DYNAMIC(CGE2, PLUGIN_TYPE_ENGINE, CGE2::CGE2MetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(CGE2, PLUGIN_TYPE_ENGINE, CGE2::CGE2MetaEngine); #else - REGISTER_PLUGIN_STATIC(CGE2, PLUGIN_TYPE_ENGINE, CGE2::CGE2MetaEngineConnect); + REGISTER_PLUGIN_STATIC(CGE2, PLUGIN_TYPE_ENGINE, CGE2::CGE2MetaEngine); #endif diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp index 17ed3f2b252..c816fae9ec6 100644 --- a/engines/chewy/detection.cpp +++ b/engines/chewy/detection.cpp @@ -90,9 +90,9 @@ static const ChewyGameDescription gameDescriptions[] = { } // End of namespace Chewy -class ChewyMetaEngine : public AdvancedMetaEngine { +class ChewyMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ChewyMetaEngine() : AdvancedMetaEngine(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) { + ChewyMetaEngineStatic() : AdvancedMetaEngineStatic(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -110,4 +110,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(CHEWY_DETECTION, PLUGIN_TYPE_METAENGINE, ChewyMetaEngine); +REGISTER_PLUGIN_STATIC(CHEWY_DETECTION, PLUGIN_TYPE_METAENGINE, ChewyMetaEngineStatic); diff --git a/engines/chewy/metaengine.cpp b/engines/chewy/metaengine.cpp index bf14b79ebb0..1be80fe05a4 100644 --- a/engines/chewy/metaengine.cpp +++ b/engines/chewy/metaengine.cpp @@ -41,7 +41,7 @@ Common::Language ChewyEngine::getLanguage() const { } // End of namespace Chewy -class ChewyMetaEngineConnect : public AdvancedMetaEngineConnect { +class ChewyMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "chewy"; @@ -56,7 +56,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool ChewyMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ChewyMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -74,7 +74,7 @@ bool Chewy::ChewyEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool ChewyMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ChewyMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Chewy::ChewyGameDescription *gd = (const Chewy::ChewyGameDescription *)desc; if (gd) { *engine = new Chewy::ChewyEngine(syst, gd); @@ -82,25 +82,25 @@ bool ChewyMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, cons return gd != 0; } -SaveStateList ChewyMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ChewyMetaEngine::listSaves(const char *target) const { SaveStateList saveList; return saveList; } -int ChewyMetaEngineConnect::getMaximumSaveSlot() const { +int ChewyMetaEngine::getMaximumSaveSlot() const { return 999; } -void ChewyMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ChewyMetaEngine::removeSaveState(const char *target, int slot) const { } -SaveStateDescriptor ChewyMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor ChewyMetaEngine::querySaveMetaInfos(const char *target, int slot) const { return SaveStateDescriptor(); } #if PLUGIN_ENABLED_DYNAMIC(CHEWY) - REGISTER_PLUGIN_DYNAMIC(CHEWY, PLUGIN_TYPE_ENGINE, ChewyMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(CHEWY, PLUGIN_TYPE_ENGINE, ChewyMetaEngine); #else - REGISTER_PLUGIN_STATIC(CHEWY, PLUGIN_TYPE_ENGINE, ChewyMetaEngineConnect); + REGISTER_PLUGIN_STATIC(CHEWY, PLUGIN_TYPE_ENGINE, ChewyMetaEngine); #endif diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 7b183b6868f..752d8c683b6 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -59,9 +59,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class CineMetaEngine : public AdvancedMetaEngine { +class CineMetaEngineStatic : public AdvancedMetaEngineStatic { public: - CineMetaEngine() : AdvancedMetaEngine(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) { + CineMetaEngineStatic() : AdvancedMetaEngineStatic(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) { _guiOptions = GUIO3(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_TRANSPARENT_DIALOG_BOXES); } @@ -78,4 +78,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(CINE_DETECTION, PLUGIN_TYPE_METAENGINE, CineMetaEngine); +REGISTER_PLUGIN_STATIC(CINE_DETECTION, PLUGIN_TYPE_METAENGINE, CineMetaEngineStatic); diff --git a/engines/cine/metaengine.cpp b/engines/cine/metaengine.cpp index 12c2d0a7bc0..60cd0fb1b7f 100644 --- a/engines/cine/metaengine.cpp +++ b/engines/cine/metaengine.cpp @@ -48,14 +48,14 @@ Common::Platform CineEngine::getPlatform() const { return _gameDescription->desc } // End of namespace Cine -class CineMetaEngineConnect : public AdvancedMetaEngineConnect { +class CineMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "cine"; } Common::Error createInstance(OSystem *syst, Engine **engine) const override { - return AdvancedMetaEngineConnect::createInstance(syst, engine); + return AdvancedMetaEngine::createInstance(syst, engine); } bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; @@ -67,7 +67,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool CineMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool CineMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -86,7 +86,7 @@ bool Cine::CineEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool CineMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool CineMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Cine::CINEGameDescription *gd = (const Cine::CINEGameDescription *)desc; if (gd) { *engine = new Cine::CineEngine(syst, gd); @@ -94,7 +94,7 @@ bool CineMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } -SaveStateList CineMetaEngineConnect::listSaves(const char *target) const { +SaveStateList CineMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); SaveStateList saveList; @@ -170,13 +170,13 @@ SaveStateList CineMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int CineMetaEngineConnect::getMaximumSaveSlot() const { return MAX_SAVEGAMES - 1; } +int CineMetaEngine::getMaximumSaveSlot() const { return MAX_SAVEGAMES - 1; } -Common::String CineMetaEngineConnect::getSavegameFile(int saveGameIdx, const char *target) const { +Common::String CineMetaEngine::getSavegameFile(int saveGameIdx, const char *target) const { return Common::String::format("%s.%d", target == nullptr ? getEngineId() : target, saveGameIdx); } -SaveStateDescriptor CineMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor CineMetaEngine::querySaveMetaInfos(const char *target, int slot) const { if (slot < 0 || slot > getMaximumSaveSlot()) { // HACK: Try to make SaveLoadChooserGrid::open() not use save slot // numbers over the maximum save slot number for "New save". @@ -239,7 +239,7 @@ SaveStateDescriptor CineMetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -void CineMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void CineMetaEngine::removeSaveState(const char *target, int slot) const { if (slot < 0 || slot >= MAX_SAVEGAMES) { return; } @@ -285,9 +285,9 @@ void CineMetaEngineConnect::removeSaveState(const char *target, int slot) const } #if PLUGIN_ENABLED_DYNAMIC(CINE) - REGISTER_PLUGIN_DYNAMIC(CINE, PLUGIN_TYPE_ENGINE, CineMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(CINE, PLUGIN_TYPE_ENGINE, CineMetaEngine); #else - REGISTER_PLUGIN_STATIC(CINE, PLUGIN_TYPE_ENGINE, CineMetaEngineConnect); + REGISTER_PLUGIN_STATIC(CINE, PLUGIN_TYPE_ENGINE, CineMetaEngine); #endif namespace Cine { diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index f5cd98cb7a4..6b03f4fcd36 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -879,7 +879,7 @@ bool CineEngine::makeLoad(const Common::String &saveName) { } ExtendedSavegameHeader header; - if (MetaEngineConnect::readSavegameHeader(saveFile.get(), &header)) { + if (MetaEngine::readSavegameHeader(saveFile.get(), &header)) { setTotalPlayTime(header.playtime * 1000); // Seconds to milliseconds } } @@ -1030,7 +1030,7 @@ void CineEngine::makeSave(const Common::String &saveFileName, uint32 playtime, renderer->popSavedBackBuffer(BEFORE_OPENING_MENU); } - MetaEngineConnect::appendExtendedSave(fHandle.get(), playtime, desc, isAutosave); + MetaEngine::appendExtendedSave(fHandle.get(), playtime, desc, isAutosave); renderer->restoreSavedBackBuffer(BEFORE_TAKING_THUMBNAIL); diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index 57cc9bcbbde..087d2a29bf3 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -52,9 +52,9 @@ static const char *directoryGlobs[] = { 0 }; -class ComposerMetaEngine : public AdvancedMetaEngine { +class ComposerMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ComposerMetaEngine() : AdvancedMetaEngine(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) { + ComposerMetaEngineStatic() : AdvancedMetaEngineStatic(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -72,4 +72,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_METAENGINE, ComposerMetaEngine); +REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_METAENGINE, ComposerMetaEngineStatic); diff --git a/engines/composer/metaengine.cpp b/engines/composer/metaengine.cpp index bb70d1bdc48..8c7511dc698 100644 --- a/engines/composer/metaengine.cpp +++ b/engines/composer/metaengine.cpp @@ -65,7 +65,7 @@ bool ComposerEngine::loadDetectedConfigFile(Common::INIFile &configFile) const { } // End of namespace Composer -class ComposerMetaEngineConnect : public AdvancedMetaEngineConnect { +class ComposerMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "composer"; @@ -78,7 +78,7 @@ public: SaveStateList listSaves(const char* target) const override; }; -bool ComposerMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ComposerMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Composer::ComposerGameDescription *gd = (const Composer::ComposerGameDescription *)desc; if (gd) { *engine = new Composer::ComposerEngine(syst, gd); @@ -86,7 +86,7 @@ bool ComposerMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c return gd != 0; } -bool ComposerMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ComposerMetaEngine::hasFeature(MetaEngineFeature f) const { return ((f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup)); } @@ -99,10 +99,10 @@ Common::String getSaveName(Common::InSaveFile *in) { ser.syncString(name); return name; } -int ComposerMetaEngineConnect::getMaximumSaveSlot() const { +int ComposerMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList ComposerMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ComposerMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -136,7 +136,7 @@ bool Composer::ComposerEngine::hasFeature(EngineFeature f) const { } #if PLUGIN_ENABLED_DYNAMIC(COMPOSER) - REGISTER_PLUGIN_DYNAMIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngine); #else - REGISTER_PLUGIN_STATIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngineConnect); + REGISTER_PLUGIN_STATIC(COMPOSER, PLUGIN_TYPE_ENGINE, ComposerMetaEngine); #endif diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index b47cdb59ee8..dddd524feee 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -170,9 +170,9 @@ static const CRUISEGameDescription gameDescriptions[] = { } -class CruiseMetaEngine : public AdvancedMetaEngine { +class CruiseMetaEngineStatic : public AdvancedMetaEngineStatic { public: - CruiseMetaEngine() : AdvancedMetaEngine(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { + CruiseMetaEngineStatic() : AdvancedMetaEngineStatic(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) { _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } @@ -189,4 +189,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(CRUISE_DETECTION, PLUGIN_TYPE_METAENGINE, CruiseMetaEngine); +REGISTER_PLUGIN_STATIC(CRUISE_DETECTION, PLUGIN_TYPE_METAENGINE, CruiseMetaEngineStatic); diff --git a/engines/cruise/metaengine.cpp b/engines/cruise/metaengine.cpp index 83abf985fef..5224d3bad14 100644 --- a/engines/cruise/metaengine.cpp +++ b/engines/cruise/metaengine.cpp @@ -44,7 +44,7 @@ Common::Platform CruiseEngine::getPlatform() const { } // End of namespace Cruise -class CruiseMetaEngineConnect : public AdvancedMetaEngineConnect { +class CruiseMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "cruise"; @@ -59,7 +59,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool CruiseMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool CruiseMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -68,7 +68,7 @@ bool CruiseMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup); } -SaveStateList CruiseMetaEngineConnect::listSaves(const char *target) const { +SaveStateList CruiseMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern("cruise.s##"); @@ -96,11 +96,11 @@ SaveStateList CruiseMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void CruiseMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void CruiseMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Cruise::CruiseEngine::getSavegameFile(slot)); } -SaveStateDescriptor CruiseMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor CruiseMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading( Cruise::CruiseEngine::getSavegameFile(slot)); @@ -123,7 +123,7 @@ SaveStateDescriptor CruiseMetaEngineConnect::querySaveMetaInfos(const char *targ return SaveStateDescriptor(); } -bool CruiseMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool CruiseMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Cruise::CRUISEGameDescription *gd = (const Cruise::CRUISEGameDescription *)desc; if (gd) { *engine = new Cruise::CruiseEngine(syst, gd); @@ -132,7 +132,7 @@ bool CruiseMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con } #if PLUGIN_ENABLED_DYNAMIC(CRUISE) - REGISTER_PLUGIN_DYNAMIC(CRUISE, PLUGIN_TYPE_ENGINE, CruiseMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(CRUISE, PLUGIN_TYPE_ENGINE, CruiseMetaEngine); #else - REGISTER_PLUGIN_STATIC(CRUISE, PLUGIN_TYPE_ENGINE, CruiseMetaEngineConnect); + REGISTER_PLUGIN_STATIC(CRUISE, PLUGIN_TYPE_ENGINE, CruiseMetaEngine); #endif diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp index 37b1d60a089..cfff60604b8 100644 --- a/engines/cryo/detection.cpp +++ b/engines/cryo/detection.cpp @@ -119,9 +119,9 @@ static const ADGameDescription gameDescriptions[] = { } // End of namespace Cryo -class CryoMetaEngine : public AdvancedMetaEngine { +class CryoMetaEngineStatic : public AdvancedMetaEngineStatic { public: - CryoMetaEngine() : AdvancedMetaEngine(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) { + CryoMetaEngineStatic() : AdvancedMetaEngineStatic(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) { } const char *getEngineId() const override { @@ -137,4 +137,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(CRYO_DETECTION, PLUGIN_TYPE_METAENGINE, CryoMetaEngine); +REGISTER_PLUGIN_STATIC(CRYO_DETECTION, PLUGIN_TYPE_METAENGINE, CryoMetaEngineStatic); diff --git a/engines/cryo/metaengine.cpp b/engines/cryo/metaengine.cpp index 428b41d1c3a..47a7bd1a2db 100644 --- a/engines/cryo/metaengine.cpp +++ b/engines/cryo/metaengine.cpp @@ -35,7 +35,7 @@ Common::Platform CryoEngine::getPlatform() const { return _gameDescription->plat } // End of namespace Cryo -class CryoMetaEngineConnect : public AdvancedMetaEngineConnect { +class CryoMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "cryo"; @@ -45,11 +45,11 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool CryoMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool CryoMetaEngine::hasFeature(MetaEngineFeature f) const { return false; } -bool CryoMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool CryoMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Cryo::CryoEngine(syst, desc); } @@ -57,8 +57,8 @@ bool CryoMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(CRYO) - REGISTER_PLUGIN_DYNAMIC(CRYO, PLUGIN_TYPE_ENGINE, CryoMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(CRYO, PLUGIN_TYPE_ENGINE, CryoMetaEngine); #else - REGISTER_PLUGIN_STATIC(CRYO, PLUGIN_TYPE_ENGINE, CryoMetaEngineConnect); + REGISTER_PLUGIN_STATIC(CRYO, PLUGIN_TYPE_ENGINE, CryoMetaEngine); #endif diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp index 054af4dbaeb..c8a50c159ed 100644 --- a/engines/cryomni3d/detection.cpp +++ b/engines/cryomni3d/detection.cpp @@ -46,9 +46,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class CryOmni3DMetaEngine : public AdvancedMetaEngine { +class CryOmni3DMetaEngineStatic : public AdvancedMetaEngineStatic { public: - CryOmni3DMetaEngine() : AdvancedMetaEngine(CryOmni3D::gameDescriptions, + CryOmni3DMetaEngineStatic() : AdvancedMetaEngineStatic(CryOmni3D::gameDescriptions, sizeof(CryOmni3DGameDescription), cryomni3DGames, optionsList) { _directoryGlobs = directoryGlobs; _maxScanDepth = 5; @@ -74,4 +74,4 @@ public: } // End of Namespace CryOmni3D -REGISTER_PLUGIN_STATIC(CRYOMNI3D_DETECTION, PLUGIN_TYPE_METAENGINE, CryOmni3D::CryOmni3DMetaEngine); +REGISTER_PLUGIN_STATIC(CRYOMNI3D_DETECTION, PLUGIN_TYPE_METAENGINE, CryOmni3D::CryOmni3DMetaEngineStatic); diff --git a/engines/cryomni3d/metaengine.cpp b/engines/cryomni3d/metaengine.cpp index edf688c6611..42f830aecb5 100644 --- a/engines/cryomni3d/metaengine.cpp +++ b/engines/cryomni3d/metaengine.cpp @@ -67,7 +67,7 @@ bool CryOmni3DEngine::hasFeature(EngineFeature f) const { } -class CryOmni3DMetaEngineConnect : public AdvancedMetaEngineConnect { +class CryOmni3DMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "cryomni3d"; @@ -81,7 +81,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool CryOmni3DMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool CryOmni3DMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) @@ -89,7 +89,7 @@ bool CryOmni3DMetaEngineConnect::hasFeature(MetaEngineFeature f) const { || (f == kSimpleSavesNames); } -SaveStateList CryOmni3DMetaEngineConnect::listSaves(const char *target) const { +SaveStateList CryOmni3DMetaEngine::listSaves(const char *target) const { // Replicate constant here to shorten lines static const uint kSaveDescriptionLen = CryOmni3DEngine::kSaveDescriptionLen; SaveStateList saveList; @@ -123,13 +123,13 @@ SaveStateList CryOmni3DMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void CryOmni3DMetaEngineConnect::removeSaveState(const char *target, int slot) 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); } -bool CryOmni3DMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, +bool CryOmni3DMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const CryOmni3DGameDescription *gd = (const CryOmni3DGameDescription *)desc; @@ -154,7 +154,7 @@ bool CryOmni3DMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, } // End of namespace CryOmni3D #if PLUGIN_ENABLED_DYNAMIC(CRYOMNI3D) - REGISTER_PLUGIN_DYNAMIC(CRYOMNI3D, PLUGIN_TYPE_ENGINE, CryOmni3D::CryOmni3DMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(CRYOMNI3D, PLUGIN_TYPE_ENGINE, CryOmni3D::CryOmni3DMetaEngine); #else - REGISTER_PLUGIN_STATIC(CRYOMNI3D, PLUGIN_TYPE_ENGINE, CryOmni3D::CryOmni3DMetaEngineConnect); + REGISTER_PLUGIN_STATIC(CRYOMNI3D, PLUGIN_TYPE_ENGINE, CryOmni3D::CryOmni3DMetaEngine); #endif diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp index 6f4bce2f797..81de4e99db2 100644 --- a/engines/director/detection.cpp +++ b/engines/director/detection.cpp @@ -174,9 +174,9 @@ static const char *directoryGlobs[] = { 0 }; -class DirectorMetaEngine : public AdvancedMetaEngine { +class DirectorMetaEngineStatic : public AdvancedMetaEngineStatic { public: - DirectorMetaEngine() : AdvancedMetaEngine(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) { + DirectorMetaEngineStatic() : AdvancedMetaEngineStatic(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -213,7 +213,7 @@ static Director::DirectorGameDescription s_fallbackDesc = { static char s_fallbackFileNameBuffer[51]; static char s_fallbackExtraBuf[256]; -ADDetectedGame DirectorMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame DirectorMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { // TODO: Handle Mac fallback // reset fallback description @@ -321,4 +321,4 @@ ADDetectedGame DirectorMetaEngine::fallbackDetect(const FileMap &allFiles, const return ADDetectedGame(); } -REGISTER_PLUGIN_STATIC(DIRECTOR_DETECTION, PLUGIN_TYPE_METAENGINE, DirectorMetaEngine); +REGISTER_PLUGIN_STATIC(DIRECTOR_DETECTION, PLUGIN_TYPE_METAENGINE, DirectorMetaEngineStatic); diff --git a/engines/director/metaengine.cpp b/engines/director/metaengine.cpp index 15f4313e56b..9f545fcec99 100644 --- a/engines/director/metaengine.cpp +++ b/engines/director/metaengine.cpp @@ -86,7 +86,7 @@ bool DirectorEngine::hasFeature(EngineFeature f) const { } // End of Namespace Director -class DirectorMetaEngineConnect : public AdvancedMetaEngineConnect { +class DirectorMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "director"; @@ -95,7 +95,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool DirectorMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool DirectorMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Director::DirectorGameDescription *gd = (const Director::DirectorGameDescription *)desc; if (gd) @@ -105,7 +105,7 @@ bool DirectorMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c } #if PLUGIN_ENABLED_DYNAMIC(DIRECTOR) - REGISTER_PLUGIN_DYNAMIC(DIRECTOR, PLUGIN_TYPE_ENGINE, DirectorMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(DIRECTOR, PLUGIN_TYPE_ENGINE, DirectorMetaEngine); #else - REGISTER_PLUGIN_STATIC(DIRECTOR, PLUGIN_TYPE_ENGINE, DirectorMetaEngineConnect); + REGISTER_PLUGIN_STATIC(DIRECTOR, PLUGIN_TYPE_ENGINE, DirectorMetaEngine); #endif diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp index 0a36556b1f0..d6087b3f18d 100644 --- a/engines/dm/detection.cpp +++ b/engines/dm/detection.cpp @@ -92,9 +92,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class DMMetaEngine : public AdvancedMetaEngine { +class DMMetaEngineStatic : public AdvancedMetaEngineStatic { public: - DMMetaEngine() : AdvancedMetaEngine(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) { + DMMetaEngineStatic() : AdvancedMetaEngineStatic(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) { } const char *getEngineId() const override { @@ -114,4 +114,4 @@ public: } // End of namespace DM -REGISTER_PLUGIN_STATIC(DM_DETECTION, PLUGIN_TYPE_METAENGINE, DM::DMMetaEngine); +REGISTER_PLUGIN_STATIC(DM_DETECTION, PLUGIN_TYPE_METAENGINE, DM::DMMetaEngineStatic); diff --git a/engines/dm/metaengine.cpp b/engines/dm/metaengine.cpp index 853034313cd..25f585c2d3a 100644 --- a/engines/dm/metaengine.cpp +++ b/engines/dm/metaengine.cpp @@ -36,7 +36,7 @@ namespace DM { -class DMMetaEngineConnect : public AdvancedMetaEngineConnect { +class DMMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "dm"; @@ -116,7 +116,7 @@ public: } // End of namespace DM #if PLUGIN_ENABLED_DYNAMIC(DM) - REGISTER_PLUGIN_DYNAMIC(DM, PLUGIN_TYPE_ENGINE, DM::DMMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(DM, PLUGIN_TYPE_ENGINE, DM::DMMetaEngine); #else - REGISTER_PLUGIN_STATIC(DM, PLUGIN_TYPE_ENGINE, DM::DMMetaEngineConnect); + REGISTER_PLUGIN_STATIC(DM, PLUGIN_TYPE_ENGINE, DM::DMMetaEngine); #endif diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp index d34cbf3ba2c..4aad4a70d90 100644 --- a/engines/draci/detection.cpp +++ b/engines/draci/detection.cpp @@ -78,9 +78,9 @@ const ADGameDescription gameDescriptions[] = { } // End of namespace Draci -class DraciMetaEngine : public AdvancedMetaEngine { +class DraciMetaEngineStatic : public AdvancedMetaEngineStatic { public: - DraciMetaEngine() : AdvancedMetaEngine(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { + DraciMetaEngineStatic() : AdvancedMetaEngineStatic(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) { } const char *getEngineId() const override { @@ -96,4 +96,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(DRACI_DETECTION, PLUGIN_TYPE_METAENGINE, DraciMetaEngine); +REGISTER_PLUGIN_STATIC(DRACI_DETECTION, PLUGIN_TYPE_METAENGINE, DraciMetaEngineStatic); diff --git a/engines/draci/metaengine.cpp b/engines/draci/metaengine.cpp index 1a2bfdfb801..f211037d58a 100644 --- a/engines/draci/metaengine.cpp +++ b/engines/draci/metaengine.cpp @@ -28,7 +28,7 @@ #include "engines/advancedDetector.h" #include "engines/metaengine.h" -class DraciMetaEngineConnect : public AdvancedMetaEngineConnect { +class DraciMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "draci"; @@ -42,7 +42,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool DraciMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool DraciMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -53,7 +53,7 @@ bool DraciMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSupportsLoadingDuringStartup); } -SaveStateList DraciMetaEngineConnect::listSaves(const char *target) const { +SaveStateList DraciMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern("draci.s##"); @@ -82,11 +82,11 @@ SaveStateList DraciMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void DraciMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void DraciMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Draci::DraciEngine::getSavegameFile(slot)); } -SaveStateDescriptor DraciMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor DraciMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading( Draci::DraciEngine::getSavegameFile(slot)); @@ -120,7 +120,7 @@ SaveStateDescriptor DraciMetaEngineConnect::querySaveMetaInfos(const char *targe return SaveStateDescriptor(); } -bool DraciMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool DraciMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Draci::DraciEngine(syst, desc); } @@ -128,7 +128,7 @@ bool DraciMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, cons } #if PLUGIN_ENABLED_DYNAMIC(DRACI) - REGISTER_PLUGIN_DYNAMIC(DRACI, PLUGIN_TYPE_ENGINE, DraciMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(DRACI, PLUGIN_TYPE_ENGINE, DraciMetaEngine); #else - REGISTER_PLUGIN_STATIC(DRACI, PLUGIN_TYPE_ENGINE, DraciMetaEngineConnect); + REGISTER_PLUGIN_STATIC(DRACI, PLUGIN_TYPE_ENGINE, DraciMetaEngine); #endif diff --git a/engines/dragons/detection.cpp b/engines/dragons/detection.cpp index 7356a4b0d8c..d8eafd0d0a5 100644 --- a/engines/dragons/detection.cpp +++ b/engines/dragons/detection.cpp @@ -123,9 +123,9 @@ static const char * const directoryGlobs[] = { 0 }; -class DragonsMetaEngine : public AdvancedMetaEngine { +class DragonsMetaEngineStatic : public AdvancedMetaEngineStatic { public: - DragonsMetaEngine() : AdvancedMetaEngine(Dragons::gameDescriptions, sizeof(Dragons::DragonsGameDescription), dragonsGames) { + DragonsMetaEngineStatic() : AdvancedMetaEngineStatic(Dragons::gameDescriptions, sizeof(Dragons::DragonsGameDescription), dragonsGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -143,4 +143,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(DRAGONS_DETECTION, PLUGIN_TYPE_METAENGINE, DragonsMetaEngine); +REGISTER_PLUGIN_STATIC(DRAGONS_DETECTION, PLUGIN_TYPE_METAENGINE, DragonsMetaEngineStatic); diff --git a/engines/dragons/metaengine.cpp b/engines/dragons/metaengine.cpp index d8d3ef70667..f372c7996d5 100644 --- a/engines/dragons/metaengine.cpp +++ b/engines/dragons/metaengine.cpp @@ -31,7 +31,7 @@ #include "base/plugins.h" #include "graphics/thumbnail.h" -class DragonsMetaEngineConnect : public AdvancedMetaEngineConnect { +class DragonsMetaEngine : public AdvancedMetaEngine { public: const char *getName() const { return "dragons"; @@ -46,7 +46,7 @@ public: Common::KeymapArray initKeymaps(const char *target) const override; }; -bool DragonsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool DragonsMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -56,16 +56,16 @@ bool DragonsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportCreationDate); } -void DragonsMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void DragonsMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int DragonsMetaEngineConnect::getMaximumSaveSlot() const { +int DragonsMetaEngine::getMaximumSaveSlot() const { return 999; } -SaveStateList DragonsMetaEngineConnect::listSaves(const char *target) const { +SaveStateList DragonsMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Dragons::SaveHeader header; Common::String pattern = target; @@ -90,7 +90,7 @@ SaveStateList DragonsMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor DragonsMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor DragonsMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Dragons::DragonsEngine::getSavegameFilename(target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); if (in) { @@ -113,7 +113,7 @@ SaveStateDescriptor DragonsMetaEngineConnect::querySaveMetaInfos(const char *tar return SaveStateDescriptor(); } -bool DragonsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool DragonsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Dragons::DragonsGameDescription *gd = (const Dragons::DragonsGameDescription *)desc; if (gd) { switch (gd->gameId) { @@ -132,7 +132,7 @@ bool DragonsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, co return desc != 0; } -Common::KeymapArray DragonsMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray DragonsMetaEngine::initKeymaps(const char *target) const { using namespace Common; Keymap *engineKeyMap = new Keymap(Keymap::kKeymapTypeGame, "dragons", "Blazing Dragons"); @@ -236,7 +236,7 @@ Common::KeymapArray DragonsMetaEngineConnect::initKeymaps(const char *target) co } #if PLUGIN_ENABLED_DYNAMIC(DRAGONS) - REGISTER_PLUGIN_DYNAMIC(DRAGONS, PLUGIN_TYPE_ENGINE, DragonsMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(DRAGONS, PLUGIN_TYPE_ENGINE, DragonsMetaEngine); #else - REGISTER_PLUGIN_STATIC(DRAGONS, PLUGIN_TYPE_ENGINE, DragonsMetaEngineConnect); + REGISTER_PLUGIN_STATIC(DRAGONS, PLUGIN_TYPE_ENGINE, DragonsMetaEngine); #endif diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp index 98a4f7c5e1a..1eb8468d7d8 100644 --- a/engines/drascula/detection.cpp +++ b/engines/drascula/detection.cpp @@ -302,9 +302,9 @@ static const ExtraGuiOption drasculaExtraGuiOption = { false }; -class DrasculaMetaEngine : public AdvancedMetaEngine { +class DrasculaMetaEngineStatic : public AdvancedMetaEngineStatic { public: - DrasculaMetaEngine() : AdvancedMetaEngine(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { + DrasculaMetaEngineStatic() : AdvancedMetaEngineStatic(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) { _guiOptions = GUIO1(GUIO_NOMIDI); } @@ -323,7 +323,7 @@ public: const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override; }; -const ExtraGuiOptions DrasculaMetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions DrasculaMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; options.push_back(drasculaExtraGuiOption); return options; @@ -331,4 +331,4 @@ const ExtraGuiOptions DrasculaMetaEngine::getExtraGuiOptions(const Common::Strin } // End of namespace Drascula -REGISTER_PLUGIN_STATIC(DRASCULA_DETECTION, PLUGIN_TYPE_METAENGINE, Drascula::DrasculaMetaEngine); +REGISTER_PLUGIN_STATIC(DRASCULA_DETECTION, PLUGIN_TYPE_METAENGINE, Drascula::DrasculaMetaEngineStatic); diff --git a/engines/drascula/metaengine.cpp b/engines/drascula/metaengine.cpp index ec732a512b8..1495ae7176f 100644 --- a/engines/drascula/metaengine.cpp +++ b/engines/drascula/metaengine.cpp @@ -58,7 +58,7 @@ namespace Drascula { SaveStateDescriptor loadMetaData(Common::ReadStream *s, int slot, bool setPlayTime); -class DrasculaMetaEngineConnect : public AdvancedMetaEngineConnect { +class DrasculaMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "drascula"; @@ -73,7 +73,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool DrasculaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool DrasculaMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -85,7 +85,7 @@ bool DrasculaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -SaveStateList DrasculaMetaEngineConnect::listSaves(const char *target) const { +SaveStateList DrasculaMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -119,7 +119,7 @@ SaveStateList DrasculaMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor DrasculaMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor DrasculaMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName); @@ -150,14 +150,14 @@ SaveStateDescriptor DrasculaMetaEngineConnect::querySaveMetaInfos(const char *ta return desc; } -int DrasculaMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int DrasculaMetaEngine::getMaximumSaveSlot() const { return 999; } -void DrasculaMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void DrasculaMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -bool DrasculaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Drascula::DrasculaGameDescription *gd = (const Drascula::DrasculaGameDescription *)desc; if (gd) { *engine = new Drascula::DrasculaEngine(syst, gd); @@ -168,7 +168,7 @@ bool DrasculaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c } // End of namespace Drascula #if PLUGIN_ENABLED_DYNAMIC(DRASCULA) - REGISTER_PLUGIN_DYNAMIC(DRASCULA, PLUGIN_TYPE_ENGINE, Drascula::DrasculaMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(DRASCULA, PLUGIN_TYPE_ENGINE, Drascula::DrasculaMetaEngine); #else - REGISTER_PLUGIN_STATIC(DRASCULA, PLUGIN_TYPE_ENGINE, Drascula::DrasculaMetaEngineConnect); + REGISTER_PLUGIN_STATIC(DRASCULA, PLUGIN_TYPE_ENGINE, Drascula::DrasculaMetaEngine); #endif diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp index 19e9a502a13..4da74dc059e 100644 --- a/engines/dreamweb/detection.cpp +++ b/engines/dreamweb/detection.cpp @@ -61,10 +61,10 @@ static const ADExtraGuiOptionsMap gameGuiOptions[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class DreamWebMetaEngine : public AdvancedMetaEngine { +class DreamWebMetaEngineStatic : public AdvancedMetaEngineStatic { public: - DreamWebMetaEngine(): - AdvancedMetaEngine(DreamWeb::gameDescriptions, + DreamWebMetaEngineStatic(): + AdvancedMetaEngineStatic(DreamWeb::gameDescriptions, sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames, gameGuiOptions) { _guiOptions = GUIO1(GUIO_NOMIDI); @@ -83,4 +83,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(DREAMWEB_DETECTION, PLUGIN_TYPE_METAENGINE, DreamWebMetaEngine); +REGISTER_PLUGIN_STATIC(DREAMWEB_DETECTION, PLUGIN_TYPE_METAENGINE, DreamWebMetaEngineStatic); diff --git a/engines/dreamweb/metaengine.cpp b/engines/dreamweb/metaengine.cpp index 1d7a1c213f0..576d34378ff 100644 --- a/engines/dreamweb/metaengine.cpp +++ b/engines/dreamweb/metaengine.cpp @@ -29,7 +29,7 @@ #include "dreamweb/dreamweb.h" #include "dreamweb/detection.h" -class DreamWebMetaEngineConnect : public AdvancedMetaEngineConnect { +class DreamWebMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "dreamweb"; @@ -45,7 +45,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool DreamWebMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool DreamWebMetaEngine::hasFeature(MetaEngineFeature f) const { switch(f) { case kSupportsListSaves: case kSupportsLoadingDuringStartup: @@ -71,7 +71,7 @@ bool DreamWeb::DreamWebEngine::hasFeature(EngineFeature f) const { } } -bool DreamWebMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool DreamWebMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const DreamWeb::DreamWebGameDescription *gd = (const DreamWeb::DreamWebGameDescription *)desc; if (gd) { *engine = new DreamWeb::DreamWebEngine(syst, gd); @@ -79,7 +79,7 @@ bool DreamWebMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c return gd != 0; } -SaveStateList DreamWebMetaEngineConnect::listSaves(const char *target) const { +SaveStateList DreamWebMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray files = saveFileMan->listSavefiles("DREAMWEB.D##"); @@ -104,14 +104,14 @@ SaveStateList DreamWebMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int DreamWebMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int DreamWebMetaEngine::getMaximumSaveSlot() const { return 99; } -void DreamWebMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void DreamWebMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("DREAMWEB.D%02d", slot); g_system->getSavefileManager()->removeSavefile(fileName); } -SaveStateDescriptor DreamWebMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor DreamWebMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Common::String::format("DREAMWEB.D%02d", slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); @@ -178,9 +178,9 @@ SaveStateDescriptor DreamWebMetaEngineConnect::querySaveMetaInfos(const char *ta } #if PLUGIN_ENABLED_DYNAMIC(DREAMWEB) - REGISTER_PLUGIN_DYNAMIC(DREAMWEB, PLUGIN_TYPE_ENGINE, DreamWebMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(DREAMWEB, PLUGIN_TYPE_ENGINE, DreamWebMetaEngine); #else - REGISTER_PLUGIN_STATIC(DREAMWEB, PLUGIN_TYPE_ENGINE, DreamWebMetaEngineConnect); + REGISTER_PLUGIN_STATIC(DREAMWEB, PLUGIN_TYPE_ENGINE, DreamWebMetaEngine); #endif namespace DreamWeb { diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp index a73cc08cae3..6473ca227c9 100644 --- a/engines/fullpipe/detection.cpp +++ b/engines/fullpipe/detection.cpp @@ -106,9 +106,9 @@ static const ADGameDescription gameDescriptions[] = { } // End of namespace Fullpipe -class FullpipeMetaEngine : public AdvancedMetaEngine { +class FullpipeMetaEngineStatic : public AdvancedMetaEngineStatic { public: - FullpipeMetaEngine() : AdvancedMetaEngine(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) { + FullpipeMetaEngineStatic() : AdvancedMetaEngineStatic(Fullpipe::gameDescriptions, sizeof(ADGameDescription), fullpipeGames) { } const char *getEngineId() const override { @@ -124,4 +124,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(FULLPIPE_DETECTION, PLUGIN_TYPE_METAENGINE, FullpipeMetaEngine); +REGISTER_PLUGIN_STATIC(FULLPIPE_DETECTION, PLUGIN_TYPE_METAENGINE, FullpipeMetaEngineStatic); diff --git a/engines/fullpipe/metaengine.cpp b/engines/fullpipe/metaengine.cpp index b230912a707..0b2970bed29 100644 --- a/engines/fullpipe/metaengine.cpp +++ b/engines/fullpipe/metaengine.cpp @@ -46,7 +46,7 @@ Common::Language FullpipeEngine::getLanguage() const { } // End of namspace Fullpipe -class FullpipeMetaEngineConnect : public AdvancedMetaEngineConnect { +class FullpipeMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "fullpipe"; @@ -62,7 +62,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool FullpipeMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool FullpipeMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -81,7 +81,7 @@ bool Fullpipe::FullpipeEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -SaveStateList FullpipeMetaEngineConnect::listSaves(const char *target) const { +SaveStateList FullpipeMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern("fullpipe.s##"); @@ -117,11 +117,11 @@ SaveStateList FullpipeMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void FullpipeMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void FullpipeMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Fullpipe::getSavegameFile(slot)); } -SaveStateDescriptor FullpipeMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor FullpipeMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::ScopedPtr f(g_system->getSavefileManager()->openForLoading( Fullpipe::getSavegameFile(slot))); @@ -145,7 +145,7 @@ SaveStateDescriptor FullpipeMetaEngineConnect::querySaveMetaInfos(const char *ta return SaveStateDescriptor(); } -bool FullpipeMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool FullpipeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Fullpipe::FullpipeEngine(syst, desc); } @@ -153,7 +153,7 @@ bool FullpipeMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c } #if PLUGIN_ENABLED_DYNAMIC(FULLPIPE) - REGISTER_PLUGIN_DYNAMIC(FULLPIPE, PLUGIN_TYPE_ENGINE, FullpipeMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(FULLPIPE, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine); #else - REGISTER_PLUGIN_STATIC(FULLPIPE, PLUGIN_TYPE_ENGINE, FullpipeMetaEngineConnect); + REGISTER_PLUGIN_STATIC(FULLPIPE, PLUGIN_TYPE_ENGINE, FullpipeMetaEngine); #endif diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp index eb081845ba7..25d2d8e2c47 100644 --- a/engines/glk/detection.cpp +++ b/engines/glk/detection.cpp @@ -114,7 +114,7 @@ GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common: } // End of namespace Glk -PlainGameList GlkMetaEngine::getSupportedGames() const { +PlainGameList GlkMetaEngineStatic::getSupportedGames() const { PlainGameList list; Glk::Adrift::AdriftMetaEngine::getSupportedGames(list); Glk::AdvSys::AdvSysMetaEngine::getSupportedGames(list); @@ -142,7 +142,7 @@ PlainGameList GlkMetaEngine::getSupportedGames() const { Glk::GameDescriptor gd##SUBENGINE = Glk::SUBENGINE::SUBENGINE##MetaEngine::findGame(gameId); \ if (gd##SUBENGINE._description) return gd##SUBENGINE -PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { +PlainGameDescriptor GlkMetaEngineStatic::findGame(const char *gameId) const { FIND_GAME(Adrift); FIND_GAME(AdvSys); FIND_GAME(Alan2); @@ -167,7 +167,7 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { #undef FIND_GAME -DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const { +DetectedGames GlkMetaEngineStatic::detectGames(const Common::FSList &fslist) const { // This is as good a place as any to detect multiple sub-engines using the same Ids detectClashes(); @@ -194,7 +194,7 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const { return detectedGames; } -void GlkMetaEngine::detectClashes() const { +void GlkMetaEngineStatic::detectClashes() const { Common::StringMap map; Glk::Adrift::AdriftMetaEngine::detectClashes(map); Glk::AdvSys::AdvSysMetaEngine::detectClashes(map); @@ -216,7 +216,7 @@ void GlkMetaEngine::detectClashes() const { #endif } -const ExtraGuiOptions GlkMetaEngine::getExtraGuiOptions(const Common::String &) const { +const ExtraGuiOptions GlkMetaEngineStatic::getExtraGuiOptions(const Common::String &) const { ExtraGuiOptions options; #if defined(USE_TTS) static const ExtraGuiOption ttsSpeakOptions = { @@ -237,4 +237,4 @@ const ExtraGuiOptions GlkMetaEngine::getExtraGuiOptions(const Common::String &) return options; } -REGISTER_PLUGIN_STATIC(GLK_DETECTION, PLUGIN_TYPE_METAENGINE, GlkMetaEngine); +REGISTER_PLUGIN_STATIC(GLK_DETECTION, PLUGIN_TYPE_METAENGINE, GlkMetaEngineStatic); diff --git a/engines/glk/detection.h b/engines/glk/detection.h index e1e97e4001c..30cd50db8d7 100644 --- a/engines/glk/detection.h +++ b/engines/glk/detection.h @@ -29,9 +29,9 @@ /** * ScummVM Meta Engine interface */ -class GlkMetaEngine : public MetaEngine { +class GlkMetaEngineStatic : public MetaEngineStatic { public: - GlkMetaEngine() : MetaEngine() {} + GlkMetaEngineStatic() : MetaEngineStatic() {} const char *getName() const override { return "Glk"; diff --git a/engines/glk/metaengine.cpp b/engines/glk/metaengine.cpp index b30b55a0a80..d73ad00c1bd 100644 --- a/engines/glk/metaengine.cpp +++ b/engines/glk/metaengine.cpp @@ -73,7 +73,7 @@ #define MAX_SAVES 99 -class GlkMetaEngineConnect : public MetaEngineConnect { +class GlkMetaEngine : public MetaEngine { private: Common::String findFileByGameId(const Common::String &gameId) const; public: @@ -90,7 +90,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool GlkMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool GlkMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -138,14 +138,14 @@ templatebool create(OSystem *syst, } } -Common::String GlkMetaEngineConnect::findFileByGameId(const Common::String &gameId) const { +Common::String GlkMetaEngine::findFileByGameId(const Common::String &gameId) const { // Get the list of files in the folder and return detection against them Common::FSNode folder = Common::FSNode(ConfMan.get("path")); Common::FSList fslist; folder.getChildren(fslist, Common::FSNode::kListFilesOnly); // Get the matching MetaEngine for this Engine. - const MetaEngine &metaEngine = g_engine->getMetaEngine(); + const MetaEngineStatic &metaEngine = g_engine->getMetaEngine(); // Iterate over the files for (Common::FSList::iterator i = fslist.begin(); i != fslist.end(); ++i) { @@ -163,7 +163,7 @@ Common::String GlkMetaEngineConnect::findFileByGameId(const Common::String &game return Common::String(); } -Common::Error GlkMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { +Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) const { #ifndef RELEASE_BUILD Glk::GameDescriptor td = Glk::GameDescriptor::empty(); #endif @@ -231,7 +231,7 @@ Common::Error GlkMetaEngineConnect::createInstance(OSystem *syst, Engine **engin return *engine ? Common::kNoError : Common::kUserCanceled; } -SaveStateList GlkMetaEngineConnect::listSaves(const char *target) const { +SaveStateList GlkMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -262,16 +262,16 @@ SaveStateList GlkMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int GlkMetaEngineConnect::getMaximumSaveSlot() const { +int GlkMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void GlkMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void GlkMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor GlkMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor GlkMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename); SaveStateDescriptor ssd; @@ -290,7 +290,7 @@ SaveStateDescriptor GlkMetaEngineConnect::querySaveMetaInfos(const char *target, } #if PLUGIN_ENABLED_DYNAMIC(GLK) - REGISTER_PLUGIN_DYNAMIC(GLK, PLUGIN_TYPE_ENGINE, GlkMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(GLK, PLUGIN_TYPE_ENGINE, GlkMetaEngine); #else - REGISTER_PLUGIN_STATIC(GLK, PLUGIN_TYPE_ENGINE, GlkMetaEngineConnect); + REGISTER_PLUGIN_STATIC(GLK, PLUGIN_TYPE_ENGINE, GlkMetaEngine); #endif diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp index deeed2a0db2..6f5a163ac5d 100644 --- a/engines/gnap/detection.cpp +++ b/engines/gnap/detection.cpp @@ -83,9 +83,9 @@ static const ADGameDescription gameDescriptions[] = { } // End of namespace Gnap -class GnapMetaEngine : public AdvancedMetaEngine { +class GnapMetaEngineStatic : public AdvancedMetaEngineStatic { public: - GnapMetaEngine() : AdvancedMetaEngine(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) { + GnapMetaEngineStatic() : AdvancedMetaEngineStatic(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) { _maxScanDepth = 3; } @@ -102,4 +102,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(GNAP_DETECTION, PLUGIN_TYPE_METAENGINE, GnapMetaEngine); +REGISTER_PLUGIN_STATIC(GNAP_DETECTION, PLUGIN_TYPE_METAENGINE, GnapMetaEngineStatic); diff --git a/engines/gnap/metaengine.cpp b/engines/gnap/metaengine.cpp index 7d981081d73..f12eda06523 100644 --- a/engines/gnap/metaengine.cpp +++ b/engines/gnap/metaengine.cpp @@ -29,7 +29,7 @@ #include "base/plugins.h" #include "graphics/thumbnail.h" -class GnapMetaEngineConnect : public AdvancedMetaEngineConnect { +class GnapMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "gnap"; @@ -44,7 +44,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool GnapMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool GnapMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -62,14 +62,14 @@ bool Gnap::GnapEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -void GnapMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void GnapMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int GnapMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int GnapMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList GnapMetaEngineConnect::listSaves(const char *target) const { +SaveStateList GnapMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -99,7 +99,7 @@ SaveStateList GnapMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor GnapMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +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); if (file) { @@ -144,7 +144,7 @@ SaveStateDescriptor GnapMetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -bool GnapMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool GnapMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Gnap::GnapEngine(syst, desc); } @@ -152,7 +152,7 @@ bool GnapMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(GNAP) - REGISTER_PLUGIN_DYNAMIC(GNAP, PLUGIN_TYPE_ENGINE, GnapMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(GNAP, PLUGIN_TYPE_ENGINE, GnapMetaEngine); #else - REGISTER_PLUGIN_STATIC(GNAP, PLUGIN_TYPE_ENGINE, GnapMetaEngineConnect); + REGISTER_PLUGIN_STATIC(GNAP, PLUGIN_TYPE_ENGINE, GnapMetaEngine); #endif diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp index d408dbd093e..f9fd1c61a48 100644 --- a/engines/gob/detection/detection.cpp +++ b/engines/gob/detection/detection.cpp @@ -27,9 +27,9 @@ #include "gob/detection/detection.h" #include "gob/detection/tables.h" -class GobMetaEngine : public AdvancedMetaEngine { +class GobMetaEngineStatic : public AdvancedMetaEngineStatic { public: - GobMetaEngine(); + GobMetaEngineStatic(); const char *getEngineId() const override { return "gob"; @@ -47,13 +47,13 @@ private: static const Gob::GOBGameDescription *detectOnceUponATime(const Common::FSList &fslist); }; -GobMetaEngine::GobMetaEngine() : - AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { +GobMetaEngineStatic::GobMetaEngineStatic() : + AdvancedMetaEngineStatic(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) { _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); } -ADDetectedGame GobMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame GobMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { ADDetectedGame detectedGame = detectGameFilebased(allFiles, Gob::fileBased); if (!detectedGame.desc) { return ADDetectedGame(); @@ -71,7 +71,7 @@ ADDetectedGame GobMetaEngine::fallbackDetect(const FileMap &allFiles, const Comm return detectedGame; } -const Gob::GOBGameDescription *GobMetaEngine::detectOnceUponATime(const Common::FSList &fslist) { +const Gob::GOBGameDescription *GobMetaEngineStatic::detectOnceUponATime(const Common::FSList &fslist) { // Add the game path to the search manager SearchMan.clear(); SearchMan.addDirectory(fslist.begin()->getParent().getPath(), fslist.begin()->getParent()); @@ -140,7 +140,7 @@ const Gob::GOBGameDescription *GobMetaEngine::detectOnceUponATime(const Common:: SearchMan.clear(); if ((gameType == Gob::kOnceUponATimeInvalid) || (platform == Gob::kOnceUponATimePlatformInvalid)) { - warning("GobMetaEngine::detectOnceUponATime(): Detection failed (%d, %d)", + warning("GobMetaEngineStatic::detectOnceUponATime(): Detection failed (%d, %d)", (int)gameType, (int)platform); return 0; } @@ -148,12 +148,12 @@ const Gob::GOBGameDescription *GobMetaEngine::detectOnceUponATime(const Common:: return &Gob::fallbackOnceUpon[gameType][platform]; } -const char *GobMetaEngine::getName() const { +const char *GobMetaEngineStatic::getName() const { return "Gob"; } -const char *GobMetaEngine::getOriginalCopyright() const { +const char *GobMetaEngineStatic::getOriginalCopyright() const { return "Goblins Games (C) Coktel Vision"; } -REGISTER_PLUGIN_STATIC(GOB_DETECTION, PLUGIN_TYPE_METAENGINE, GobMetaEngine); +REGISTER_PLUGIN_STATIC(GOB_DETECTION, PLUGIN_TYPE_METAENGINE, GobMetaEngineStatic); diff --git a/engines/gob/metaengine.cpp b/engines/gob/metaengine.cpp index 4ec0a04cf86..a4f24a091df 100644 --- a/engines/gob/metaengine.cpp +++ b/engines/gob/metaengine.cpp @@ -27,7 +27,7 @@ // For struct GOBGameDescription. #include "gob/detection/detection.h" -class GobMetaEngineConnect : public AdvancedMetaEngineConnect { +class GobMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "gob"; @@ -39,7 +39,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool GobMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool GobMetaEngine::hasFeature(MetaEngineFeature f) const { return false; } @@ -48,11 +48,11 @@ bool Gob::GobEngine::hasFeature(EngineFeature f) const { (f == kSupportsReturnToLauncher); } -Common::Error GobMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { - return AdvancedMetaEngineConnect::createInstance(syst, engine); +Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine) const { + return AdvancedMetaEngine::createInstance(syst, engine); } -bool GobMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Gob::GOBGameDescription *gd = (const Gob::GOBGameDescription *)desc; if (gd) { *engine = new Gob::GobEngine(syst); @@ -63,9 +63,9 @@ bool GobMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const #if PLUGIN_ENABLED_DYNAMIC(GOB) - REGISTER_PLUGIN_DYNAMIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngine); #else - REGISTER_PLUGIN_STATIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngineConnect); + REGISTER_PLUGIN_STATIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngine); #endif namespace Gob { diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp index a41c397a106..74d6bc27189 100644 --- a/engines/griffon/detection.cpp +++ b/engines/griffon/detection.cpp @@ -46,9 +46,9 @@ static const ADGameDescription gameDescriptions[] = { } -class GriffonMetaEngine: public AdvancedMetaEngine { +class GriffonMetaEngineStatic: public AdvancedMetaEngineStatic { public: - GriffonMetaEngine() : AdvancedMetaEngine(Griffon::gameDescriptions, sizeof(ADGameDescription), griffonGames) { + GriffonMetaEngineStatic() : AdvancedMetaEngineStatic(Griffon::gameDescriptions, sizeof(ADGameDescription), griffonGames) { } const char *getEngineId() const override { @@ -64,4 +64,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(GRIFFON_DETECTION, PLUGIN_TYPE_METAENGINE, GriffonMetaEngine); +REGISTER_PLUGIN_STATIC(GRIFFON_DETECTION, PLUGIN_TYPE_METAENGINE, GriffonMetaEngineStatic); diff --git a/engines/griffon/metaengine.cpp b/engines/griffon/metaengine.cpp index 53caf64a883..86db14f6dd8 100644 --- a/engines/griffon/metaengine.cpp +++ b/engines/griffon/metaengine.cpp @@ -31,7 +31,7 @@ #include "griffon/griffon.h" -class GriffonMetaEngineConnect: public AdvancedMetaEngineConnect { +class GriffonMetaEngine: public AdvancedMetaEngine { public: const char *getName() const override { return "griffon"; @@ -52,7 +52,7 @@ public: }; -Common::String GriffonMetaEngineConnect::getSavegameFile(int saveGameIdx, const char *target) const { +Common::String GriffonMetaEngine::getSavegameFile(int saveGameIdx, const char *target) const { if (saveGameIdx == kSavegameFilePattern) { // Pattern requested return Common::String::format("%s.s##", target == nullptr ? getEngineId() : target); @@ -69,14 +69,14 @@ bool Griffon::GriffonEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool GriffonMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool GriffonMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new Griffon::GriffonEngine(syst); return desc != nullptr; } -Common::KeymapArray GriffonMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray GriffonMetaEngine::initKeymaps(const char *target) const { using namespace Common; Keymap *engineKeyMap = new Keymap(Keymap::kKeymapTypeGame, "griffon", "The Griffon Legend"); @@ -143,7 +143,7 @@ Common::KeymapArray GriffonMetaEngineConnect::initKeymaps(const char *target) co } #if PLUGIN_ENABLED_DYNAMIC(GRIFFON) - REGISTER_PLUGIN_DYNAMIC(GRIFFON, PLUGIN_TYPE_ENGINE, GriffonMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(GRIFFON, PLUGIN_TYPE_ENGINE, GriffonMetaEngine); #else - REGISTER_PLUGIN_STATIC(GRIFFON, PLUGIN_TYPE_ENGINE, GriffonMetaEngineConnect); + REGISTER_PLUGIN_STATIC(GRIFFON, PLUGIN_TYPE_ENGINE, GriffonMetaEngine); #endif diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index e0e44798605..53e365153ca 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -327,9 +327,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class GroovieMetaEngine : public AdvancedMetaEngine { +class GroovieMetaEngineStatic : public AdvancedMetaEngineStatic { public: - GroovieMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) { + GroovieMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) { // Use kADFlagUseExtraAsHint in order to distinguish the 11th hour from // its "Making of" as well as the Clandestiny Trailer; they all share // the same MD5. @@ -361,4 +361,4 @@ public: } // End of namespace Groovie -REGISTER_PLUGIN_STATIC(GROOVIE_DETECTION, PLUGIN_TYPE_METAENGINE, Groovie::GroovieMetaEngine); +REGISTER_PLUGIN_STATIC(GROOVIE_DETECTION, PLUGIN_TYPE_METAENGINE, Groovie::GroovieMetaEngineStatic); diff --git a/engines/groovie/metaengine.cpp b/engines/groovie/metaengine.cpp index 316237f6a70..1361d04a661 100644 --- a/engines/groovie/metaengine.cpp +++ b/engines/groovie/metaengine.cpp @@ -31,7 +31,7 @@ namespace Groovie { -class GroovieMetaEngineConnect : public AdvancedMetaEngineConnect { +class GroovieMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "groovie"; @@ -46,14 +46,14 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool GroovieMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { +bool GroovieMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) { *engine = new GroovieEngine(syst, (const GroovieGameDescription *)gd); } return gd != 0; } -bool GroovieMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool GroovieMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -61,15 +61,15 @@ bool GroovieMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportMetaInfo); } -SaveStateList GroovieMetaEngineConnect::listSaves(const char *target) const { +SaveStateList GroovieMetaEngine::listSaves(const char *target) const { return SaveLoad::listValidSaves(target); } -int GroovieMetaEngineConnect::getMaximumSaveSlot() const { +int GroovieMetaEngine::getMaximumSaveSlot() const { return SaveLoad::getMaximumSlot(); } -void GroovieMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void GroovieMetaEngine::removeSaveState(const char *target, int slot) const { if (!SaveLoad::isSlotValid(slot)) { // Invalid slot, do nothing return; @@ -79,7 +79,7 @@ void GroovieMetaEngineConnect::removeSaveState(const char *target, int slot) con g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor GroovieMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor GroovieMetaEngine::querySaveMetaInfos(const char *target, int slot) const { SaveStateDescriptor desc; Common::InSaveFile *savefile = SaveLoad::openForLoading(target, slot, &desc); @@ -91,7 +91,7 @@ SaveStateDescriptor GroovieMetaEngineConnect::querySaveMetaInfos(const char *tar } // End of namespace Groovie #if PLUGIN_ENABLED_DYNAMIC(GROOVIE) - REGISTER_PLUGIN_DYNAMIC(GROOVIE, PLUGIN_TYPE_ENGINE, Groovie::GroovieMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(GROOVIE, PLUGIN_TYPE_ENGINE, Groovie::GroovieMetaEngine); #else - REGISTER_PLUGIN_STATIC(GROOVIE, PLUGIN_TYPE_ENGINE, Groovie::GroovieMetaEngineConnect); + REGISTER_PLUGIN_STATIC(GROOVIE, PLUGIN_TYPE_ENGINE, Groovie::GroovieMetaEngine); #endif diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp index e199a90fa9a..01d21039f2a 100644 --- a/engines/hdb/detection.cpp +++ b/engines/hdb/detection.cpp @@ -131,9 +131,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class HDBMetaEngine : public AdvancedMetaEngine { +class HDBMetaEngineStatic : public AdvancedMetaEngineStatic { public: - HDBMetaEngine() : AdvancedMetaEngine(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) { + HDBMetaEngineStatic() : AdvancedMetaEngineStatic(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) { } const char *getEngineId() const override { @@ -149,4 +149,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(HDB_DETECTION, PLUGIN_TYPE_METAENGINE, HDBMetaEngine); +REGISTER_PLUGIN_STATIC(HDB_DETECTION, PLUGIN_TYPE_METAENGINE, HDBMetaEngineStatic); diff --git a/engines/hdb/metaengine.cpp b/engines/hdb/metaengine.cpp index 6627db9c84b..3ca7d83dded 100644 --- a/engines/hdb/metaengine.cpp +++ b/engines/hdb/metaengine.cpp @@ -63,7 +63,7 @@ bool HDBGame::isHandango() const { } // End of namespace HDB -class HDBMetaEngineConnect : public AdvancedMetaEngineConnect { +class HDBMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "hdb"; @@ -79,7 +79,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool HDBMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool HDBMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsLoadingDuringStartup) || (f == kSupportsListSaves) || @@ -95,14 +95,14 @@ bool HDB::HDBGame::hasFeature(Engine::EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -void HDBMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void HDBMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int HDBMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int HDBMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList HDBMetaEngineConnect::listSaves(const char *target) const { +SaveStateList HDBMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -150,7 +150,7 @@ SaveStateList HDBMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor HDBMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor HDBMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::ScopedPtr in(g_system->getSavefileManager()->openForLoading(Common::String::format("%s.%03d", target, slot))); if (in) { @@ -176,7 +176,7 @@ SaveStateDescriptor HDBMetaEngineConnect::querySaveMetaInfos(const char *target, return SaveStateDescriptor(); } -Common::KeymapArray HDBMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray HDBMetaEngine::initKeymaps(const char *target) const { using namespace Common; using namespace HDB; @@ -260,7 +260,7 @@ Common::KeymapArray HDBMetaEngineConnect::initKeymaps(const char *target) const return Keymap::arrayOf(engineKeyMap); } -bool HDBMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool HDBMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new HDB::HDBGame(syst, desc); } @@ -269,7 +269,7 @@ bool HDBMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(HDB) - REGISTER_PLUGIN_DYNAMIC(HDB, PLUGIN_TYPE_ENGINE, HDBMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(HDB, PLUGIN_TYPE_ENGINE, HDBMetaEngine); #else - REGISTER_PLUGIN_STATIC(HDB, PLUGIN_TYPE_ENGINE, HDBMetaEngineConnect); + REGISTER_PLUGIN_STATIC(HDB, PLUGIN_TYPE_ENGINE, HDBMetaEngine); #endif diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp index 97fcb86eb9d..d0f29f16c3b 100644 --- a/engines/hopkins/detection.cpp +++ b/engines/hopkins/detection.cpp @@ -63,9 +63,9 @@ const static char *directoryGlobs[] = { 0 }; -class HopkinsMetaEngine : public AdvancedMetaEngine { +class HopkinsMetaEngineStatic : public AdvancedMetaEngineStatic { public: - HopkinsMetaEngine() : AdvancedMetaEngine(Hopkins::gameDescriptions, sizeof(Hopkins::HopkinsGameDescription), hopkinsGames, optionsList) { + HopkinsMetaEngineStatic() : AdvancedMetaEngineStatic(Hopkins::gameDescriptions, sizeof(Hopkins::HopkinsGameDescription), hopkinsGames, optionsList) { _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } @@ -84,4 +84,4 @@ public: }; -REGISTER_PLUGIN_STATIC(HOPKINS_DETECTION, PLUGIN_TYPE_METAENGINE, HopkinsMetaEngine); +REGISTER_PLUGIN_STATIC(HOPKINS_DETECTION, PLUGIN_TYPE_METAENGINE, HopkinsMetaEngineStatic); diff --git a/engines/hopkins/metaengine.cpp b/engines/hopkins/metaengine.cpp index bc07ba15993..fdd0d09f582 100644 --- a/engines/hopkins/metaengine.cpp +++ b/engines/hopkins/metaengine.cpp @@ -59,7 +59,7 @@ const Common::String &HopkinsEngine::getTargetName() const { } // End of namespace Hopkins -class HopkinsMetaEngineConnect : public AdvancedMetaEngineConnect { +class HopkinsMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "hopkins"; @@ -74,7 +74,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool HopkinsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool HopkinsMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -91,7 +91,7 @@ bool Hopkins::HopkinsEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool HopkinsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool HopkinsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Hopkins::HopkinsGameDescription *gd = (const Hopkins::HopkinsGameDescription *)desc; if (gd) { *engine = new Hopkins::HopkinsEngine(syst, gd); @@ -99,7 +99,7 @@ bool HopkinsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, co return gd != 0; } -SaveStateList HopkinsMetaEngineConnect::listSaves(const char *target) const { +SaveStateList HopkinsMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -132,16 +132,16 @@ SaveStateList HopkinsMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int HopkinsMetaEngineConnect::getMaximumSaveSlot() const { +int HopkinsMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void HopkinsMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void HopkinsMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor HopkinsMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor HopkinsMetaEngine::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); @@ -168,7 +168,7 @@ SaveStateDescriptor HopkinsMetaEngineConnect::querySaveMetaInfos(const char *tar } #if PLUGIN_ENABLED_DYNAMIC(HOPKINS) - REGISTER_PLUGIN_DYNAMIC(HOPKINS, PLUGIN_TYPE_ENGINE, HopkinsMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(HOPKINS, PLUGIN_TYPE_ENGINE, HopkinsMetaEngine); #else - REGISTER_PLUGIN_STATIC(HOPKINS, PLUGIN_TYPE_ENGINE, HopkinsMetaEngineConnect); + REGISTER_PLUGIN_STATIC(HOPKINS, PLUGIN_TYPE_ENGINE, HopkinsMetaEngine); #endif diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp index 2559582a256..e35a75e1e5d 100644 --- a/engines/hugo/detection.cpp +++ b/engines/hugo/detection.cpp @@ -113,9 +113,9 @@ static const HugoGameDescription gameDescriptions[] = { {AD_TABLE_END_MARKER, kGameTypeNone} }; -class HugoMetaEngine : public AdvancedMetaEngine { +class HugoMetaEngineStatic : public AdvancedMetaEngineStatic { public: - HugoMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(HugoGameDescription), hugoGames) { + HugoMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(HugoGameDescription), hugoGames) { } const char *getEngineId() const override { @@ -133,4 +133,4 @@ public: } // End of namespace Hugo -REGISTER_PLUGIN_STATIC(HUGO_DETECTION, PLUGIN_TYPE_METAENGINE, Hugo::HugoMetaEngine); +REGISTER_PLUGIN_STATIC(HUGO_DETECTION, PLUGIN_TYPE_METAENGINE, Hugo::HugoMetaEngineStatic); diff --git a/engines/hugo/metaengine.cpp b/engines/hugo/metaengine.cpp index 8deb53be2c4..0169549d44f 100644 --- a/engines/hugo/metaengine.cpp +++ b/engines/hugo/metaengine.cpp @@ -40,7 +40,7 @@ const char *HugoEngine::getGameId() const { return _gameDescription->desc.gameId; } -class HugoMetaEngineConnect : public AdvancedMetaEngineConnect { +class HugoMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "hugo"; @@ -56,7 +56,7 @@ public: }; -bool HugoMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { +bool HugoMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) { *engine = new HugoEngine(syst, (const HugoGameDescription *)gd); ((HugoEngine *)*engine)->initGame((const HugoGameDescription *)gd); @@ -64,7 +64,7 @@ bool HugoMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } -bool HugoMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool HugoMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -74,9 +74,9 @@ bool HugoMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportCreationDate); } -int HugoMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int HugoMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList HugoMetaEngineConnect::listSaves(const char *target) const { +SaveStateList HugoMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -124,7 +124,7 @@ SaveStateList HugoMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor HugoMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) 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); @@ -177,7 +177,7 @@ SaveStateDescriptor HugoMetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -void HugoMetaEngineConnect::removeSaveState(const char *target, int slot) const { +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); } @@ -185,9 +185,9 @@ void HugoMetaEngineConnect::removeSaveState(const char *target, int slot) const } // End of namespace Hugo #if PLUGIN_ENABLED_DYNAMIC(HUGO) - REGISTER_PLUGIN_DYNAMIC(HUGO, PLUGIN_TYPE_ENGINE, Hugo::HugoMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(HUGO, PLUGIN_TYPE_ENGINE, Hugo::HugoMetaEngine); #else - REGISTER_PLUGIN_STATIC(HUGO, PLUGIN_TYPE_ENGINE, Hugo::HugoMetaEngineConnect); + REGISTER_PLUGIN_STATIC(HUGO, PLUGIN_TYPE_ENGINE, Hugo::HugoMetaEngine); #endif namespace Hugo { diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp index 207dbee6495..6d9f1adba4f 100644 --- a/engines/illusions/detection.cpp +++ b/engines/illusions/detection.cpp @@ -110,9 +110,9 @@ static const char * const directoryGlobs[] = { 0 }; -class IllusionsMetaEngine : public AdvancedMetaEngine { +class IllusionsMetaEngineStatic : public AdvancedMetaEngineStatic { public: - IllusionsMetaEngine() : AdvancedMetaEngine(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) { + IllusionsMetaEngineStatic() : AdvancedMetaEngineStatic(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -130,4 +130,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(ILLUSIONS_DETECTION, PLUGIN_TYPE_METAENGINE, IllusionsMetaEngine); +REGISTER_PLUGIN_STATIC(ILLUSIONS_DETECTION, PLUGIN_TYPE_METAENGINE, IllusionsMetaEngineStatic); diff --git a/engines/illusions/metaengine.cpp b/engines/illusions/metaengine.cpp index b01997b873d..ae54d008ed4 100644 --- a/engines/illusions/metaengine.cpp +++ b/engines/illusions/metaengine.cpp @@ -45,7 +45,7 @@ Common::Language IllusionsEngine::getGameLanguage() const { } // End of namespace Illusions -class IllusionsMetaEngineConnect : public AdvancedMetaEngineConnect { +class IllusionsMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "illusions"; @@ -60,7 +60,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool IllusionsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool IllusionsMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -70,16 +70,16 @@ bool IllusionsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportCreationDate); } -void IllusionsMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void IllusionsMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int IllusionsMetaEngineConnect::getMaximumSaveSlot() const { +int IllusionsMetaEngine::getMaximumSaveSlot() const { return 999; } -SaveStateList IllusionsMetaEngineConnect::listSaves(const char *target) const { +SaveStateList IllusionsMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Illusions::IllusionsEngine::SaveHeader header; Common::String pattern = target; @@ -104,7 +104,7 @@ SaveStateList IllusionsMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor IllusionsMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor IllusionsMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Illusions::IllusionsEngine::getSavegameFilename(target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); if (in) { @@ -127,7 +127,7 @@ SaveStateDescriptor IllusionsMetaEngineConnect::querySaveMetaInfos(const char *t return SaveStateDescriptor(); } -bool IllusionsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool IllusionsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Illusions::IllusionsGameDescription *gd = (const Illusions::IllusionsGameDescription *)desc; if (gd) { switch (gd->gameId) { @@ -146,7 +146,7 @@ bool IllusionsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, } #if PLUGIN_ENABLED_DYNAMIC(ILLUSIONS) - REGISTER_PLUGIN_DYNAMIC(ILLUSIONS, PLUGIN_TYPE_ENGINE, IllusionsMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(ILLUSIONS, PLUGIN_TYPE_ENGINE, IllusionsMetaEngine); #else - REGISTER_PLUGIN_STATIC(ILLUSIONS, PLUGIN_TYPE_ENGINE, IllusionsMetaEngineConnect); + REGISTER_PLUGIN_STATIC(ILLUSIONS, PLUGIN_TYPE_ENGINE, IllusionsMetaEngine); #endif diff --git a/engines/kingdom/detection.cpp b/engines/kingdom/detection.cpp index 4cf93a596ee..b5c5b5f4c4f 100644 --- a/engines/kingdom/detection.cpp +++ b/engines/kingdom/detection.cpp @@ -72,9 +72,9 @@ static const ADGameDescription gameDescriptions[] = { } // End of namespace Kingdom -class KingdomMetaEngine : public AdvancedMetaEngine { +class KingdomMetaEngineStatic : public AdvancedMetaEngineStatic { public: - KingdomMetaEngine() : AdvancedMetaEngine(Kingdom::gameDescriptions, sizeof(ADGameDescription), kingdomGames) { + KingdomMetaEngineStatic() : AdvancedMetaEngineStatic(Kingdom::gameDescriptions, sizeof(ADGameDescription), kingdomGames) { } const char *getEngineId() const override { @@ -90,4 +90,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(KINGDOM_DETECTION, PLUGIN_TYPE_METAENGINE, KingdomMetaEngine); +REGISTER_PLUGIN_STATIC(KINGDOM_DETECTION, PLUGIN_TYPE_METAENGINE, KingdomMetaEngineStatic); diff --git a/engines/kingdom/metaengine.cpp b/engines/kingdom/metaengine.cpp index 78c13dec6e4..4b130f387a3 100644 --- a/engines/kingdom/metaengine.cpp +++ b/engines/kingdom/metaengine.cpp @@ -38,7 +38,7 @@ Common::Platform KingdomGame::getPlatform() const { return _gameDescription->pla } // End of namespace Kingdom -class KingdomMetaEngineConnect : public AdvancedMetaEngineConnect { +class KingdomMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "kingdom"; @@ -53,7 +53,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool KingdomMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool KingdomMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -63,18 +63,18 @@ bool KingdomMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportCreationDate); } -bool KingdomMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool KingdomMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new Kingdom::KingdomGame(syst, desc); return desc != nullptr; } -int KingdomMetaEngineConnect::getMaximumSaveSlot() const { +int KingdomMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -SaveStateList KingdomMetaEngineConnect::listSaves(const char *target) const { +SaveStateList KingdomMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -110,12 +110,12 @@ SaveStateList KingdomMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void KingdomMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void KingdomMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor KingdomMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor KingdomMetaEngine::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); @@ -137,7 +137,7 @@ SaveStateDescriptor KingdomMetaEngineConnect::querySaveMetaInfos(const char *tar } #if PLUGIN_ENABLED_DYNAMIC(KINGDOM) - REGISTER_PLUGIN_DYNAMIC(KINGDOM, PLUGIN_TYPE_ENGINE, KingdomMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(KINGDOM, PLUGIN_TYPE_ENGINE, KingdomMetaEngine); #else - REGISTER_PLUGIN_STATIC(KINGDOM, PLUGIN_TYPE_ENGINE, KingdomMetaEngineConnect); + REGISTER_PLUGIN_STATIC(KINGDOM, PLUGIN_TYPE_ENGINE, KingdomMetaEngine); #endif diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 63443bb4463..6538578bcf4 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -144,9 +144,9 @@ const ADExtraGuiOptionsMap gameGuiOptions[] = { } // End of anonymous namespace -class KyraMetaEngine : public AdvancedMetaEngine { +class KyraMetaEngineStatic : public AdvancedMetaEngineStatic { public: - KyraMetaEngine() : AdvancedMetaEngine(adGameDescs, sizeof(KYRAGameDescription), gameList, gameGuiOptions) { + KyraMetaEngineStatic() : AdvancedMetaEngineStatic(adGameDescs, sizeof(KYRAGameDescription), gameList, gameGuiOptions) { _md5Bytes = 1024 * 1024; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; @@ -172,4 +172,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(KYRA_DETECTION, PLUGIN_TYPE_METAENGINE, KyraMetaEngine); +REGISTER_PLUGIN_STATIC(KYRA_DETECTION, PLUGIN_TYPE_METAENGINE, KyraMetaEngineStatic); diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 315708033c5..229b1a65b0a 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -48,7 +48,7 @@ namespace Graphics { struct Surface; } -class KyraMetaEngineConnect; +class KyraMetaEngine; /** * This is the namespace of the Kyra engine. @@ -147,7 +147,7 @@ struct Button; class KyraEngine_v1 : public Engine { friend class Debugger; -friend class ::KyraMetaEngineConnect; +friend class ::KyraMetaEngine; friend class GUI; friend class GUI_v1; friend class GUI_EoB; diff --git a/engines/kyra/metaengine.cpp b/engines/kyra/metaengine.cpp index 3d6c6806939..4813f796238 100644 --- a/engines/kyra/metaengine.cpp +++ b/engines/kyra/metaengine.cpp @@ -38,7 +38,7 @@ #include "kyra/detection.h" -class KyraMetaEngineConnect : public AdvancedMetaEngineConnect { +class KyraMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "kyra"; @@ -56,7 +56,7 @@ public: Common::KeymapArray initKeymaps(const char *target) const override; }; -bool KyraMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -74,7 +74,7 @@ bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const { (f == kSupportsSubtitleOptions); } -bool KyraMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const KYRAGameDescription *gd = (const KYRAGameDescription *)desc; bool res = true; @@ -134,7 +134,7 @@ bool KyraMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return res; } -SaveStateList KyraMetaEngineConnect::listSaves(const char *target) const { +SaveStateList KyraMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Kyra::KyraEngine_v1::SaveHeader header; Common::String pattern = target; @@ -169,11 +169,11 @@ SaveStateList KyraMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int KyraMetaEngineConnect::getMaximumSaveSlot() const { +int KyraMetaEngine::getMaximumSaveSlot() const { return 999; } -void KyraMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void KyraMetaEngine::removeSaveState(const char *target, int slot) const { // In Kyra games slot 0 can't be deleted, it's for restarting the game(s). // An exception makes Lands of Lore here, it does not have any way to restart the // game except via its main menu. @@ -184,7 +184,7 @@ void KyraMetaEngineConnect::removeSaveState(const char *target, int slot) const g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor KyraMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor KyraMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Kyra::KyraEngine_v1::getSavegameFilename(target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename); const bool nonKyraGame = ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("lol") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob") || ConfMan.getDomain(target)->getVal("gameid").equalsIgnoreCase("eob2"); @@ -223,7 +223,7 @@ SaveStateDescriptor KyraMetaEngineConnect::querySaveMetaInfos(const char *target return desc; } -Common::KeymapArray KyraMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray KyraMetaEngine::initKeymaps(const char *target) const { Common::String gameId = ConfMan.get("gameid", target); #ifdef ENABLE_LOL @@ -238,11 +238,11 @@ Common::KeymapArray KyraMetaEngineConnect::initKeymaps(const char *target) const } #endif - return AdvancedMetaEngineConnect::initKeymaps(target); + return AdvancedMetaEngine::initKeymaps(target); } #if PLUGIN_ENABLED_DYNAMIC(KYRA) - REGISTER_PLUGIN_DYNAMIC(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngine); #else - REGISTER_PLUGIN_STATIC(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngineConnect); + REGISTER_PLUGIN_STATIC(KYRA, PLUGIN_TYPE_ENGINE, KyraMetaEngine); #endif diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp index 6985a466958..b89e2739f9e 100644 --- a/engines/lab/detection.cpp +++ b/engines/lab/detection.cpp @@ -101,9 +101,9 @@ static const char *const directoryGlobs[] = { -class LabMetaEngine : public AdvancedMetaEngine { +class LabMetaEngineStatic : public AdvancedMetaEngineStatic { public: - LabMetaEngine() : AdvancedMetaEngine(labDescriptions, sizeof(ADGameDescription), lab_setting) { + LabMetaEngineStatic() : AdvancedMetaEngineStatic(labDescriptions, sizeof(ADGameDescription), lab_setting) { _maxScanDepth = 4; _directoryGlobs = directoryGlobs; _flags = kADFlagUseExtraAsHint; @@ -122,4 +122,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(LAB_DETECTION, PLUGIN_TYPE_METAENGINE, LabMetaEngine); +REGISTER_PLUGIN_STATIC(LAB_DETECTION, PLUGIN_TYPE_METAENGINE, LabMetaEngineStatic); diff --git a/engines/lab/metaengine.cpp b/engines/lab/metaengine.cpp index b1b81356fc4..bf69e151499 100644 --- a/engines/lab/metaengine.cpp +++ b/engines/lab/metaengine.cpp @@ -43,7 +43,7 @@ uint32 LabEngine::getFeatures() const { } // End of namespace Lab -class LabMetaEngineConnect : public AdvancedMetaEngineConnect { +class LabMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "lab"; @@ -62,7 +62,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool LabMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool LabMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -81,7 +81,7 @@ bool Lab::LabEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -SaveStateList LabMetaEngineConnect::listSaves(const char *target) const { +SaveStateList LabMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Lab::SaveGameHeader header; Common::String pattern = target; @@ -111,16 +111,16 @@ SaveStateList LabMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int LabMetaEngineConnect::getMaximumSaveSlot() const { +int LabMetaEngine::getMaximumSaveSlot() const { return 999; } -void LabMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void LabMetaEngine::removeSaveState(const char *target, int slot) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); saveFileMan->removeSavefile(Common::String::format("%s.%03u", target, slot)); } -SaveStateDescriptor LabMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor LabMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03u", target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); @@ -145,7 +145,7 @@ SaveStateDescriptor LabMetaEngineConnect::querySaveMetaInfos(const char *target, } #if PLUGIN_ENABLED_DYNAMIC(LAB) - REGISTER_PLUGIN_DYNAMIC(LAB, PLUGIN_TYPE_ENGINE, LabMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(LAB, PLUGIN_TYPE_ENGINE, LabMetaEngine); #else - REGISTER_PLUGIN_STATIC(LAB, PLUGIN_TYPE_ENGINE, LabMetaEngineConnect); + REGISTER_PLUGIN_STATIC(LAB, PLUGIN_TYPE_ENGINE, LabMetaEngine); #endif diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 0dcc5ccc573..fc070cef93c 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -223,9 +223,9 @@ static const ADGameDescription gameDescriptions[] = { }; -class LastExpressMetaEngine : public AdvancedMetaEngine { +class LastExpressMetaEngineStatic : public AdvancedMetaEngineStatic { public: - LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { + LastExpressMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) { _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX); } @@ -244,4 +244,4 @@ public: } // End of namespace LastExpress -REGISTER_PLUGIN_STATIC(LASTEXPRESS_DETECTION, PLUGIN_TYPE_METAENGINE, LastExpress::LastExpressMetaEngine); +REGISTER_PLUGIN_STATIC(LASTEXPRESS_DETECTION, PLUGIN_TYPE_METAENGINE, LastExpress::LastExpressMetaEngineStatic); diff --git a/engines/lastexpress/metaengine.cpp b/engines/lastexpress/metaengine.cpp index b9ebb244fbc..54bef00bccb 100644 --- a/engines/lastexpress/metaengine.cpp +++ b/engines/lastexpress/metaengine.cpp @@ -25,7 +25,7 @@ namespace LastExpress { -class LastExpressMetaEngineConnect : public AdvancedMetaEngineConnect { +class LastExpressMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "lastexpress"; @@ -35,7 +35,7 @@ protected: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override; }; -bool LastExpressMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { +bool LastExpressMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) { *engine = new LastExpressEngine(syst, (const ADGameDescription *)gd); } @@ -49,7 +49,7 @@ bool LastExpressEngine::isDemo() const { } // End of namespace LastExpress #if PLUGIN_ENABLED_DYNAMIC(LASTEXPRESS) - REGISTER_PLUGIN_DYNAMIC(LASTEXPRESS, PLUGIN_TYPE_ENGINE, LastExpress::LastExpressMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(LASTEXPRESS, PLUGIN_TYPE_ENGINE, LastExpress::LastExpressMetaEngine); #else - REGISTER_PLUGIN_STATIC(LASTEXPRESS, PLUGIN_TYPE_ENGINE, LastExpress::LastExpressMetaEngineConnect); + REGISTER_PLUGIN_STATIC(LASTEXPRESS, PLUGIN_TYPE_ENGINE, LastExpress::LastExpressMetaEngine); #endif diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp index 356fceef358..4013d5f3197 100644 --- a/engines/lilliput/detection.cpp +++ b/engines/lilliput/detection.cpp @@ -104,9 +104,9 @@ static const LilliputGameDescription gameDescriptions[] = { {AD_TABLE_END_MARKER, kGameTypeNone} }; -class LilliputMetaEngine : public AdvancedMetaEngine { +class LilliputMetaEngineStatic : public AdvancedMetaEngineStatic { public: - LilliputMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(LilliputGameDescription), lilliputGames) { + LilliputMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(LilliputGameDescription), lilliputGames) { } const char *getEngineId() const override { @@ -124,4 +124,4 @@ public: } // End of namespace Lilliput -REGISTER_PLUGIN_STATIC(LILLIPUT_DETECTION, PLUGIN_TYPE_METAENGINE, Lilliput::LilliputMetaEngine); +REGISTER_PLUGIN_STATIC(LILLIPUT_DETECTION, PLUGIN_TYPE_METAENGINE, Lilliput::LilliputMetaEngineStatic); diff --git a/engines/lilliput/metaengine.cpp b/engines/lilliput/metaengine.cpp index e6df2bacfbe..3a837940e20 100644 --- a/engines/lilliput/metaengine.cpp +++ b/engines/lilliput/metaengine.cpp @@ -44,7 +44,7 @@ const char *LilliputEngine::getGameId() const { namespace Lilliput { -class LilliputMetaEngineConnect : public AdvancedMetaEngineConnect { +class LilliputMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "lilliput"; @@ -59,7 +59,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool LilliputMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { +bool LilliputMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) { *engine = new LilliputEngine(syst, (const LilliputGameDescription *)gd); ((LilliputEngine *)*engine)->initGame((const LilliputGameDescription *)gd); @@ -67,7 +67,7 @@ bool LilliputMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c return gd != 0; } -bool LilliputMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool LilliputMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -77,11 +77,11 @@ bool LilliputMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportCreationDate); } -int LilliputMetaEngineConnect::getMaximumSaveSlot() const { +int LilliputMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList LilliputMetaEngineConnect::listSaves(const char *target) const { +SaveStateList LilliputMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -129,7 +129,7 @@ SaveStateList LilliputMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor LilliputMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) 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); @@ -186,7 +186,7 @@ SaveStateDescriptor LilliputMetaEngineConnect::querySaveMetaInfos(const char *ta return SaveStateDescriptor(); } -void LilliputMetaEngineConnect::removeSaveState(const char *target, int slot) const { +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); } @@ -194,9 +194,9 @@ void LilliputMetaEngineConnect::removeSaveState(const char *target, int slot) co } // End of namespace Lilliput #if PLUGIN_ENABLED_DYNAMIC(LILLIPUT) - REGISTER_PLUGIN_DYNAMIC(LILLIPUT, PLUGIN_TYPE_ENGINE, Lilliput::LilliputMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(LILLIPUT, PLUGIN_TYPE_ENGINE, Lilliput::LilliputMetaEngine); #else - REGISTER_PLUGIN_STATIC(LILLIPUT, PLUGIN_TYPE_ENGINE, Lilliput::LilliputMetaEngineConnect); + REGISTER_PLUGIN_STATIC(LILLIPUT, PLUGIN_TYPE_ENGINE, Lilliput::LilliputMetaEngine); #endif namespace Lilliput { diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp index 92619e1179f..f5ba70217e4 100644 --- a/engines/lure/detection.cpp +++ b/engines/lure/detection.cpp @@ -202,9 +202,9 @@ static const LureGameDescription gameDescriptions[] = { } // End of namespace Lure -class LureMetaEngine : public AdvancedMetaEngine { +class LureMetaEngineStatic : public AdvancedMetaEngineStatic { public: - LureMetaEngine() : AdvancedMetaEngine(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames + LureMetaEngineStatic() : AdvancedMetaEngineStatic(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames #ifdef USE_TTS , optionsList #endif @@ -230,4 +230,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(LURE_DETECTION, PLUGIN_TYPE_METAENGINE, LureMetaEngine); +REGISTER_PLUGIN_STATIC(LURE_DETECTION, PLUGIN_TYPE_METAENGINE, LureMetaEngineStatic); diff --git a/engines/lure/metaengine.cpp b/engines/lure/metaengine.cpp index c6d7171f3bb..7bac80b7c9e 100644 --- a/engines/lure/metaengine.cpp +++ b/engines/lure/metaengine.cpp @@ -50,7 +50,7 @@ LureLanguage LureEngine::getLureLanguage() const { } // End of namespace Lure -class LureMetaEngineConnect : public AdvancedMetaEngineConnect { +class LureMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "lure"; @@ -64,7 +64,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool LureMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool LureMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -78,7 +78,7 @@ bool Lure::LureEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool LureMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool LureMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Lure::LureGameDescription *gd = (const Lure::LureGameDescription *)desc; if (gd) { *engine = new Lure::LureEngine(syst, gd); @@ -86,7 +86,7 @@ bool LureMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } -SaveStateList LureMetaEngineConnect::listSaves(const char *target) const { +SaveStateList LureMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -114,9 +114,9 @@ SaveStateList LureMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int LureMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int LureMetaEngine::getMaximumSaveSlot() const { return 999; } -void LureMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void LureMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = target; filename += Common::String::format(".%03d", slot); @@ -124,7 +124,7 @@ void LureMetaEngineConnect::removeSaveState(const char *target, int slot) const } #if PLUGIN_ENABLED_DYNAMIC(LURE) - REGISTER_PLUGIN_DYNAMIC(LURE, PLUGIN_TYPE_ENGINE, LureMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(LURE, PLUGIN_TYPE_ENGINE, LureMetaEngine); #else - REGISTER_PLUGIN_STATIC(LURE, PLUGIN_TYPE_ENGINE, LureMetaEngineConnect); + REGISTER_PLUGIN_STATIC(LURE, PLUGIN_TYPE_ENGINE, LureMetaEngine); #endif diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp index 062f2695692..c25fba2bfb9 100644 --- a/engines/macventure/detection.cpp +++ b/engines/macventure/detection.cpp @@ -50,9 +50,9 @@ namespace MacVenture { SaveStateDescriptor loadMetaData(Common::SeekableReadStream *s, int slot, bool skipThumbnail = true); -class MacVentureMetaEngine : public AdvancedMetaEngine { +class MacVentureMetaEngineStatic : public AdvancedMetaEngineStatic { public: - MacVentureMetaEngine() : AdvancedMetaEngine(MacVenture::gameDescriptions, sizeof(ADGameDescription), macventureGames) { + MacVentureMetaEngineStatic() : AdvancedMetaEngineStatic(MacVenture::gameDescriptions, sizeof(ADGameDescription), macventureGames) { _guiOptions = GUIO1(GUIO_NOMIDI); _md5Bytes = 5000000; // TODO: Upper limit, adjust it once all games are added } @@ -72,4 +72,4 @@ public: } // End of namespace MacVenture -REGISTER_PLUGIN_STATIC(MACVENTURE_DETECTION, PLUGIN_TYPE_METAENGINE, MacVenture::MacVentureMetaEngine); +REGISTER_PLUGIN_STATIC(MACVENTURE_DETECTION, PLUGIN_TYPE_METAENGINE, MacVenture::MacVentureMetaEngineStatic); diff --git a/engines/macventure/metaengine.cpp b/engines/macventure/metaengine.cpp index af5a0bde124..5edf0926366 100644 --- a/engines/macventure/metaengine.cpp +++ b/engines/macventure/metaengine.cpp @@ -40,7 +40,7 @@ namespace MacVenture { SaveStateDescriptor loadMetaData(Common::SeekableReadStream *s, int slot, bool skipThumbnail = true); -class MacVentureMetaEngineConnect : public AdvancedMetaEngineConnect { +class MacVentureMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "macventure"; @@ -56,7 +56,7 @@ protected: }; -bool MacVentureMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool MacVentureMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -74,7 +74,7 @@ bool MacVentureEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -SaveStateList MacVentureMetaEngineConnect::listSaves(const char *target) const { +SaveStateList MacVentureMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -111,21 +111,21 @@ SaveStateList MacVentureMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int MacVentureMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int MacVentureMetaEngine::getMaximumSaveSlot() const { return 999; } -bool MacVentureMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *game) const { +bool MacVentureMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *game) const { if (game) { *engine = new MacVenture::MacVentureEngine(syst, game); } return game != 0; } -void MacVentureMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void MacVentureMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Common::String::format("%s.%03d", target, slot)); } -SaveStateDescriptor MacVentureMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor MacVentureMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); SaveStateDescriptor desc; Common::String saveFileName; @@ -151,7 +151,7 @@ SaveStateDescriptor MacVentureMetaEngineConnect::querySaveMetaInfos(const char * } // End of namespace MacVenture #if PLUGIN_ENABLED_DYNAMIC(MACVENTURE) - REGISTER_PLUGIN_DYNAMIC(MACVENTURE, PLUGIN_TYPE_ENGINE, MacVenture::MacVentureMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(MACVENTURE, PLUGIN_TYPE_ENGINE, MacVenture::MacVentureMetaEngine); #else - REGISTER_PLUGIN_STATIC(MACVENTURE, PLUGIN_TYPE_ENGINE, MacVenture::MacVentureMetaEngineConnect); + REGISTER_PLUGIN_STATIC(MACVENTURE, PLUGIN_TYPE_ENGINE, MacVenture::MacVentureMetaEngine); #endif diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index 3c04d58df17..b76a80cfdaf 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -35,9 +35,9 @@ static const PlainGameDescriptor madeGames[] = { #include "made/detection_tables.h" -class MadeMetaEngine : public AdvancedMetaEngine { +class MadeMetaEngineStatic : public AdvancedMetaEngineStatic { public: - MadeMetaEngine() : AdvancedMetaEngine(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { + MadeMetaEngineStatic() : AdvancedMetaEngineStatic(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) { } const char *getEngineId() const override { @@ -55,7 +55,7 @@ public: ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override; }; -ADDetectedGame MadeMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame MadeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { // Set the default values for the fallback descriptor's ADGameDescription part. Made::g_fallbackDesc.desc.language = Common::UNK_LANG; Made::g_fallbackDesc.desc.platform = Common::kPlatformDOS; @@ -70,4 +70,4 @@ ADDetectedGame MadeMetaEngine::fallbackDetect(const FileMap &allFiles, const Com return ADDetectedGame(); } -REGISTER_PLUGIN_STATIC(MADE_DETECTION, PLUGIN_TYPE_METAENGINE, MadeMetaEngine); +REGISTER_PLUGIN_STATIC(MADE_DETECTION, PLUGIN_TYPE_METAENGINE, MadeMetaEngineStatic); diff --git a/engines/made/metaengine.cpp b/engines/made/metaengine.cpp index cacc7b929ee..e3d98df657a 100644 --- a/engines/made/metaengine.cpp +++ b/engines/made/metaengine.cpp @@ -45,7 +45,7 @@ uint16 MadeEngine::getVersion() const { } // End of namespace Made -class MadeMetaEngineConnect : public AdvancedMetaEngineConnect { +class MadeMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "made"; @@ -55,7 +55,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool MadeMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool MadeMetaEngine::hasFeature(MetaEngineFeature f) const { return false; } @@ -65,7 +65,7 @@ bool Made::MadeEngine::hasFeature(EngineFeature f) const { (f == kSupportsReturnToLauncher); } -bool MadeMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool MadeMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Made::MadeGameDescription *gd = (const Made::MadeGameDescription *)desc; if (gd) { *engine = new Made::MadeEngine(syst, gd); @@ -74,7 +74,7 @@ bool MadeMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(MADE) - REGISTER_PLUGIN_DYNAMIC(MADE, PLUGIN_TYPE_ENGINE, MadeMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(MADE, PLUGIN_TYPE_ENGINE, MadeMetaEngine); #else - REGISTER_PLUGIN_STATIC(MADE, PLUGIN_TYPE_ENGINE, MadeMetaEngineConnect); + REGISTER_PLUGIN_STATIC(MADE, PLUGIN_TYPE_ENGINE, MadeMetaEngine); #endif diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp index f7d8111c9da..2accf7fe273 100644 --- a/engines/mads/detection.cpp +++ b/engines/mads/detection.cpp @@ -114,9 +114,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class MADSMetaEngine : public AdvancedMetaEngine { +class MADSMetaEngineStatic : public AdvancedMetaEngineStatic { public: - MADSMetaEngine() : AdvancedMetaEngine(MADS::gameDescriptions, sizeof(MADS::MADSGameDescription), MADSGames, optionsList) { + MADSMetaEngineStatic() : AdvancedMetaEngineStatic(MADS::gameDescriptions, sizeof(MADS::MADSGameDescription), MADSGames, optionsList) { _maxScanDepth = 3; } @@ -133,4 +133,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(MADS_DETECTION, PLUGIN_TYPE_METAENGINE, MADSMetaEngine); +REGISTER_PLUGIN_STATIC(MADS_DETECTION, PLUGIN_TYPE_METAENGINE, MADSMetaEngineStatic); diff --git a/engines/mads/metaengine.cpp b/engines/mads/metaengine.cpp index 9ba66336664..227708c555f 100644 --- a/engines/mads/metaengine.cpp +++ b/engines/mads/metaengine.cpp @@ -63,7 +63,7 @@ Common::Platform MADSEngine::getPlatform() const { } // End of namespace MADS -class MADSMetaEngineConnect : public AdvancedMetaEngineConnect { +class MADSMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "mads"; @@ -78,7 +78,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool MADSMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool MADSMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -95,7 +95,7 @@ bool MADS::MADSEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool MADSMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool MADSMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const MADS::MADSGameDescription *gd = (const MADS::MADSGameDescription *)desc; if (gd) { *engine = new MADS::MADSEngine(syst, gd); @@ -103,7 +103,7 @@ bool MADSMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } -SaveStateList MADSMetaEngineConnect::listSaves(const char *target) const { +SaveStateList MADSMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -133,16 +133,16 @@ SaveStateList MADSMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int MADSMetaEngineConnect::getMaximumSaveSlot() const { +int MADSMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void MADSMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void MADSMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor MADSMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor MADSMetaEngine::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); @@ -168,7 +168,7 @@ SaveStateDescriptor MADSMetaEngineConnect::querySaveMetaInfos(const char *target } #if PLUGIN_ENABLED_DYNAMIC(MADS) - REGISTER_PLUGIN_DYNAMIC(MADS, PLUGIN_TYPE_ENGINE, MADSMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(MADS, PLUGIN_TYPE_ENGINE, MADSMetaEngine); #else - REGISTER_PLUGIN_STATIC(MADS, PLUGIN_TYPE_ENGINE, MADSMetaEngineConnect); + REGISTER_PLUGIN_STATIC(MADS, PLUGIN_TYPE_ENGINE, MADSMetaEngine); #endif diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 1d7dcbd44ce..d44739b3029 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -76,9 +76,9 @@ static const char *directoryGlobs[] = { nullptr }; -class MohawkMetaEngine : public AdvancedMetaEngine { +class MohawkMetaEngineStatic : public AdvancedMetaEngineStatic { public: - MohawkMetaEngine() : AdvancedMetaEngine(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) { + MohawkMetaEngineStatic() : AdvancedMetaEngineStatic(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -104,8 +104,8 @@ public: void registerDefaultSettings(const Common::String &target) const override; }; -DetectedGame MohawkMetaEngine::toDetectedGame(const ADDetectedGame &adGame) const { - DetectedGame game = AdvancedMetaEngine::toDetectedGame(adGame); +DetectedGame MohawkMetaEngineStatic::toDetectedGame(const ADDetectedGame &adGame) const { + DetectedGame game = AdvancedMetaEngineStatic::toDetectedGame(adGame); // The AdvancedDetector model only allows specifying a single supported // game language. The 25th anniversary edition Myst games are multilanguage. @@ -132,7 +132,7 @@ DetectedGame MohawkMetaEngine::toDetectedGame(const ADDetectedGame &adGame) cons return game; } -void MohawkMetaEngine::registerDefaultSettings(const Common::String &target) const { +void MohawkMetaEngineStatic::registerDefaultSettings(const Common::String &target) const { Common::String gameId = ConfMan.get("gameid", target); if (gameId == "myst" || gameId == "makingofmyst") { @@ -143,7 +143,7 @@ void MohawkMetaEngine::registerDefaultSettings(const Common::String &target) con return Mohawk::MohawkMetaEngine_Riven::registerDefaultSettings(); } - return AdvancedMetaEngine::registerDefaultSettings(target); + return AdvancedMetaEngineStatic::registerDefaultSettings(target); } -REGISTER_PLUGIN_STATIC(MOHAWK_DETECTION, PLUGIN_TYPE_METAENGINE, MohawkMetaEngine); +REGISTER_PLUGIN_STATIC(MOHAWK_DETECTION, PLUGIN_TYPE_METAENGINE, MohawkMetaEngineStatic); diff --git a/engines/mohawk/metaengine.cpp b/engines/mohawk/metaengine.cpp index 764e2d8c18c..2ab8cdabe2d 100644 --- a/engines/mohawk/metaengine.cpp +++ b/engines/mohawk/metaengine.cpp @@ -119,7 +119,7 @@ bool MohawkEngine_Riven::hasFeature(EngineFeature f) const { } // End of Namespace Mohawk -class MohawkMetaEngineConnect : public AdvancedMetaEngineConnect { +class MohawkMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "mohawk"; @@ -139,7 +139,7 @@ public: GUI::OptionsContainerWidget *buildEngineOptionsWidgetDynamic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override; }; -bool MohawkMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool MohawkMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) @@ -150,7 +150,7 @@ bool MohawkMetaEngineConnect::hasFeature(MetaEngineFeature f) const { || (f == kSavesSupportPlayTime); } -SaveStateList MohawkMetaEngineConnect::listSavesForPrefix(const char *prefix, const char *extension) const { +SaveStateList MohawkMetaEngine::listSavesForPrefix(const char *prefix, const char *extension) const { Common::String pattern = Common::String::format("%s-###.%s", prefix, extension); Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern); size_t prefixLen = strlen(prefix); @@ -174,7 +174,7 @@ SaveStateList MohawkMetaEngineConnect::listSavesForPrefix(const char *prefix, co return saveList; } -SaveStateList MohawkMetaEngineConnect::listSaves(const char *target) const { +SaveStateList MohawkMetaEngine::listSaves(const char *target) const { Common::String gameId = ConfMan.get("gameid", target); SaveStateList saveList; @@ -207,7 +207,7 @@ SaveStateList MohawkMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void MohawkMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void MohawkMetaEngine::removeSaveState(const char *target, int slot) const { Common::String gameId = ConfMan.get("gameid", target); // Removing saved games is only supported in Myst/Riven currently. @@ -223,7 +223,7 @@ void MohawkMetaEngineConnect::removeSaveState(const char *target, int slot) cons #endif } -SaveStateDescriptor MohawkMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor MohawkMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String gameId = ConfMan.get("gameid", target); #ifdef ENABLE_MYST @@ -241,7 +241,7 @@ SaveStateDescriptor MohawkMetaEngineConnect::querySaveMetaInfos(const char *targ } } -Common::KeymapArray MohawkMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray MohawkMetaEngine::initKeymaps(const char *target) const { Common::String gameId = ConfMan.get("gameid", target); #ifdef ENABLE_MYST @@ -255,10 +255,10 @@ Common::KeymapArray MohawkMetaEngineConnect::initKeymaps(const char *target) con } #endif - return AdvancedMetaEngineConnect::initKeymaps(target); + return AdvancedMetaEngine::initKeymaps(target); } -bool MohawkMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool MohawkMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Mohawk::MohawkGameDescription *gd = (const Mohawk::MohawkGameDescription *)desc; if (gd) { @@ -309,7 +309,7 @@ bool MohawkMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con return (gd != nullptr); } -GUI::OptionsContainerWidget *MohawkMetaEngineConnect::buildEngineOptionsWidgetDynamic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const { +GUI::OptionsContainerWidget *MohawkMetaEngine::buildEngineOptionsWidgetDynamic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const { Common::String gameId = ConfMan.get("gameid", target); #ifdef ENABLE_MYST @@ -323,11 +323,11 @@ GUI::OptionsContainerWidget *MohawkMetaEngineConnect::buildEngineOptionsWidgetDy } #endif - return MetaEngineConnect::buildEngineOptionsWidgetDynamic(boss, name, target); + return MetaEngine::buildEngineOptionsWidgetDynamic(boss, name, target); } #if PLUGIN_ENABLED_DYNAMIC(MOHAWK) - REGISTER_PLUGIN_DYNAMIC(MOHAWK, PLUGIN_TYPE_ENGINE, MohawkMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(MOHAWK, PLUGIN_TYPE_ENGINE, MohawkMetaEngine); #else - REGISTER_PLUGIN_STATIC(MOHAWK, PLUGIN_TYPE_ENGINE, MohawkMetaEngineConnect); + REGISTER_PLUGIN_STATIC(MOHAWK, PLUGIN_TYPE_ENGINE, MohawkMetaEngine); #endif diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp index 99a324964fb..f9a7b1164f1 100644 --- a/engines/mortevielle/detection.cpp +++ b/engines/mortevielle/detection.cpp @@ -32,9 +32,9 @@ static const PlainGameDescriptor MortevielleGame[] = { #include "mortevielle/detection_tables.h" -class MortevielleMetaEngine : public AdvancedMetaEngine { +class MortevielleMetaEngineStatic : public AdvancedMetaEngineStatic { public: - MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription), + MortevielleMetaEngineStatic() : AdvancedMetaEngineStatic(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription), MortevielleGame) { _md5Bytes = 512; // Use kADFlagUseExtraAsHint to distinguish between original and improved versions @@ -56,4 +56,4 @@ public: }; -REGISTER_PLUGIN_STATIC(MORTEVIELLE_DETECTION, PLUGIN_TYPE_METAENGINE, MortevielleMetaEngine); +REGISTER_PLUGIN_STATIC(MORTEVIELLE_DETECTION, PLUGIN_TYPE_METAENGINE, MortevielleMetaEngineStatic); diff --git a/engines/mortevielle/metaengine.cpp b/engines/mortevielle/metaengine.cpp index 6bc1e23ef2c..0ce49d3dcd8 100644 --- a/engines/mortevielle/metaengine.cpp +++ b/engines/mortevielle/metaengine.cpp @@ -39,7 +39,7 @@ bool MortevielleEngine::useOriginalData() const { return _gameDescription->dataF } // End of namespace Mortevielle -class MortevielleMetaEngineConnect : public AdvancedMetaEngineConnect { +class MortevielleMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "mortevielle"; @@ -53,14 +53,14 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool MortevielleMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool MortevielleMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Mortevielle::MortevielleEngine(syst, (const Mortevielle::MortevielleGameDescription *)desc); } return desc != 0; } -bool MortevielleMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool MortevielleMetaEngine::hasFeature(MetaEngineFeature f) const { switch (f) { case kSupportsListSaves: case kSupportsDeleteSave: @@ -75,19 +75,19 @@ bool MortevielleMetaEngineConnect::hasFeature(MetaEngineFeature f) const { } } -int MortevielleMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int MortevielleMetaEngine::getMaximumSaveSlot() const { return 99; } -SaveStateList MortevielleMetaEngineConnect::listSaves(const char *target) const { +SaveStateList MortevielleMetaEngine::listSaves(const char *target) const { return Mortevielle::SavegameManager::listSaves(target); } -SaveStateDescriptor MortevielleMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor MortevielleMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Mortevielle::MortevielleEngine::generateSaveFilename(target, slot); return Mortevielle::SavegameManager::querySaveMetaInfos(filename); } #if PLUGIN_ENABLED_DYNAMIC(MORTEVIELLE) - REGISTER_PLUGIN_DYNAMIC(MORTEVIELLE, PLUGIN_TYPE_ENGINE, MortevielleMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(MORTEVIELLE, PLUGIN_TYPE_ENGINE, MortevielleMetaEngine); #else - REGISTER_PLUGIN_STATIC(MORTEVIELLE, PLUGIN_TYPE_ENGINE, MortevielleMetaEngineConnect); -#endif \ No newline at end of file + REGISTER_PLUGIN_STATIC(MORTEVIELLE, PLUGIN_TYPE_ENGINE, MortevielleMetaEngine); +#endif diff --git a/engines/mutationofjb/detection.cpp b/engines/mutationofjb/detection.cpp index a88db46fdfb..f29ef037687 100644 --- a/engines/mutationofjb/detection.cpp +++ b/engines/mutationofjb/detection.cpp @@ -79,9 +79,9 @@ static const char *const mutationofjbDirectoryGlobs[] = { nullptr }; -class MutationOfJBMetaEngine : public AdvancedMetaEngine { +class MutationOfJBMetaEngineStatic : public AdvancedMetaEngineStatic { public: - MutationOfJBMetaEngine() : AdvancedMetaEngine(mutationofjbDescriptions, sizeof(ADGameDescription), mutationofjbGames) { + MutationOfJBMetaEngineStatic() : AdvancedMetaEngineStatic(mutationofjbDescriptions, sizeof(ADGameDescription), mutationofjbGames) { _maxScanDepth = 2; _directoryGlobs = mutationofjbDirectoryGlobs; } @@ -99,4 +99,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(MUTATIONOFJB_DETECTION, PLUGIN_TYPE_METAENGINE, MutationOfJBMetaEngine); +REGISTER_PLUGIN_STATIC(MUTATIONOFJB_DETECTION, PLUGIN_TYPE_METAENGINE, MutationOfJBMetaEngineStatic); diff --git a/engines/mutationofjb/metaengine.cpp b/engines/mutationofjb/metaengine.cpp index 453bf28929b..9f23d237551 100644 --- a/engines/mutationofjb/metaengine.cpp +++ b/engines/mutationofjb/metaengine.cpp @@ -29,7 +29,7 @@ #include "engines/advancedDetector.h" -class MutationOfJBMetaEngineConnect : public AdvancedMetaEngineConnect { +class MutationOfJBMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "mutationofjb"; @@ -83,7 +83,7 @@ public: }; #if PLUGIN_ENABLED_DYNAMIC(MUTATIONOFJB) - REGISTER_PLUGIN_DYNAMIC(MUTATIONOFJB, PLUGIN_TYPE_ENGINE, MutationOfJBMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(MUTATIONOFJB, PLUGIN_TYPE_ENGINE, MutationOfJBMetaEngine); #else - REGISTER_PLUGIN_STATIC(MUTATIONOFJB, PLUGIN_TYPE_ENGINE, MutationOfJBMetaEngineConnect); + REGISTER_PLUGIN_STATIC(MUTATIONOFJB, PLUGIN_TYPE_ENGINE, MutationOfJBMetaEngine); #endif diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp index 036b3397a25..5730c94480a 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -130,9 +130,9 @@ static const ExtraGuiOption neverhoodExtraGuiOption3 = { }; -class NeverhoodMetaEngine : public AdvancedMetaEngine { +class NeverhoodMetaEngineStatic : public AdvancedMetaEngineStatic { public: - NeverhoodMetaEngine() : AdvancedMetaEngine(Neverhood::gameDescriptions, sizeof(ADGameDescription), neverhoodGames) { + NeverhoodMetaEngineStatic() : AdvancedMetaEngineStatic(Neverhood::gameDescriptions, sizeof(ADGameDescription), neverhoodGames) { _guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI); } @@ -151,7 +151,7 @@ public: const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override; }; -const ExtraGuiOptions NeverhoodMetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions NeverhoodMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; options.push_back(neverhoodExtraGuiOption1); options.push_back(neverhoodExtraGuiOption2); @@ -159,4 +159,4 @@ const ExtraGuiOptions NeverhoodMetaEngine::getExtraGuiOptions(const Common::Stri return options; } -REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_METAENGINE, NeverhoodMetaEngine); +REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_METAENGINE, NeverhoodMetaEngineStatic); diff --git a/engines/neverhood/metaengine.cpp b/engines/neverhood/metaengine.cpp index 3f7ed7aca38..28992aedc34 100644 --- a/engines/neverhood/metaengine.cpp +++ b/engines/neverhood/metaengine.cpp @@ -57,7 +57,7 @@ bool NeverhoodEngine::applyResourceFixes() const { } // End of namespace Neverhood -class NeverhoodMetaEngineConnect : public AdvancedMetaEngineConnect { +class NeverhoodMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "neverhood"; @@ -72,7 +72,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool NeverhoodMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool NeverhoodMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -91,14 +91,14 @@ bool Neverhood::NeverhoodEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool NeverhoodMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool NeverhoodMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Neverhood::NeverhoodEngine(syst, desc); } return desc != 0; } -SaveStateList NeverhoodMetaEngineConnect::listSaves(const char *target) const { +SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Neverhood::NeverhoodEngine::SaveHeader header; Common::String pattern = target; @@ -127,17 +127,17 @@ SaveStateList NeverhoodMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int NeverhoodMetaEngineConnect::getMaximumSaveSlot() const { +int NeverhoodMetaEngine::getMaximumSaveSlot() const { return 999; } -void NeverhoodMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void NeverhoodMetaEngine::removeSaveState(const char *target, int slot) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::String filename = Neverhood::NeverhoodEngine::getSavegameFilename(target, slot); saveFileMan->removeSavefile(filename.c_str()); } -SaveStateDescriptor NeverhoodMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor NeverhoodMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Neverhood::NeverhoodEngine::getSavegameFilename(target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); @@ -170,7 +170,7 @@ SaveStateDescriptor NeverhoodMetaEngineConnect::querySaveMetaInfos(const char *t } #if PLUGIN_ENABLED_DYNAMIC(NEVERHOOD) - REGISTER_PLUGIN_DYNAMIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine); #else - REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngineConnect); + REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine); #endif diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index 6f38b981dac..3ebf1f410f8 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -201,9 +201,9 @@ static const PARALLACTIONGameDescription gameDescriptions[] = { } -class ParallactionMetaEngine : public AdvancedMetaEngine { +class ParallactionMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ParallactionMetaEngine() : AdvancedMetaEngine(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) { + ParallactionMetaEngineStatic() : AdvancedMetaEngineStatic(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) { _guiOptions = GUIO1(GUIO_NOLAUNCHLOAD); } @@ -220,4 +220,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(PARALLACTION_DETECTION, PLUGIN_TYPE_METAENGINE, ParallactionMetaEngine); +REGISTER_PLUGIN_STATIC(PARALLACTION_DETECTION, PLUGIN_TYPE_METAENGINE, ParallactionMetaEngineStatic); diff --git a/engines/parallaction/metaengine.cpp b/engines/parallaction/metaengine.cpp index 42ec7d6520f..82231a74aad 100644 --- a/engines/parallaction/metaengine.cpp +++ b/engines/parallaction/metaengine.cpp @@ -39,7 +39,7 @@ Common::Platform Parallaction::getPlatform() const { return _gameDescription->de } // End of namespace Parallaction -class ParallactionMetaEngineConnect : public AdvancedMetaEngineConnect { +class ParallactionMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "parallaction"; @@ -53,7 +53,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool ParallactionMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ParallactionMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave); @@ -64,7 +64,7 @@ bool Parallaction::Parallaction::hasFeature(EngineFeature f) const { (f == kSupportsReturnToLauncher); } -bool ParallactionMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ParallactionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Parallaction::PARALLACTIONGameDescription *gd = (const Parallaction::PARALLACTIONGameDescription *)desc; bool res = true; @@ -83,7 +83,7 @@ bool ParallactionMetaEngineConnect::createInstance(OSystem *syst, Engine **engin return res; } -SaveStateList ParallactionMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ParallactionMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::String pattern(ConfMan.getDomain(target)->getVal("gameid") + ".0##"); @@ -109,9 +109,9 @@ SaveStateList ParallactionMetaEngineConnect::listSaves(const char *target) const return saveList; } -int ParallactionMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int ParallactionMetaEngine::getMaximumSaveSlot() const { return 99; } -void ParallactionMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ParallactionMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = ConfMan.getDomain(target)->getVal("gameid"); filename += Common::String::format(".0%02d", slot); @@ -119,7 +119,7 @@ void ParallactionMetaEngineConnect::removeSaveState(const char *target, int slot } #if PLUGIN_ENABLED_DYNAMIC(PARALLACTION) - REGISTER_PLUGIN_DYNAMIC(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngine); #else - REGISTER_PLUGIN_STATIC(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngineConnect); + REGISTER_PLUGIN_STATIC(PARALLACTION, PLUGIN_TYPE_ENGINE, ParallactionMetaEngine); #endif diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp index 090f7935d22..b14ea22bfbe 100644 --- a/engines/pegasus/detection.cpp +++ b/engines/pegasus/detection.cpp @@ -91,9 +91,9 @@ static const PegasusGameDescription gameDescriptions[] = { } // End of namespace Pegasus -class PegasusMetaEngine : public AdvancedMetaEngine { +class PegasusMetaEngineStatic : public AdvancedMetaEngineStatic { public: - PegasusMetaEngine() : AdvancedMetaEngine(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) { + PegasusMetaEngineStatic() : AdvancedMetaEngineStatic(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) { } const char *getEngineId() const override { @@ -109,4 +109,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(PEGASUS_DETECTION, PLUGIN_TYPE_METAENGINE, PegasusMetaEngine); +REGISTER_PLUGIN_STATIC(PEGASUS_DETECTION, PLUGIN_TYPE_METAENGINE, PegasusMetaEngineStatic); diff --git a/engines/pegasus/metaengine.cpp b/engines/pegasus/metaengine.cpp index d6616ec67c0..33f0896307c 100644 --- a/engines/pegasus/metaengine.cpp +++ b/engines/pegasus/metaengine.cpp @@ -61,7 +61,7 @@ bool PegasusEngine::isWindows() const { } // End of namespace Pegasus -class PegasusMetaEngineConnect : public AdvancedMetaEngineConnect { +class PegasusMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "pegasus"; @@ -76,14 +76,14 @@ public: Common::KeymapArray initKeymaps(const char *target) const override; }; -bool PegasusMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool PegasusMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave); } -SaveStateList PegasusMetaEngineConnect::listSaves(const char *target) const { +SaveStateList PegasusMetaEngine::listSaves(const char *target) const { // The original had no pattern, so the user must rename theirs // Note that we ignore the target because saves are compatible between // all versions @@ -102,17 +102,17 @@ SaveStateList PegasusMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void PegasusMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void PegasusMetaEngine::removeSaveState(const char *target, int slot) const { // See listSaves() for info on the pattern Common::StringArray fileNames = Pegasus::PegasusEngine::listSaveFiles(); g_system->getSavefileManager()->removeSavefile(fileNames[slot].c_str()); } -Common::KeymapArray PegasusMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray PegasusMetaEngine::initKeymaps(const char *target) const { return Pegasus::PegasusEngine::initKeymaps(); } -bool PegasusMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool PegasusMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Pegasus::PegasusGameDescription *gd = (const Pegasus::PegasusGameDescription *)desc; if (gd) @@ -122,7 +122,7 @@ bool PegasusMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, co } #if PLUGIN_ENABLED_DYNAMIC(PEGASUS) - REGISTER_PLUGIN_DYNAMIC(PEGASUS, PLUGIN_TYPE_ENGINE, PegasusMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(PEGASUS, PLUGIN_TYPE_ENGINE, PegasusMetaEngine); #else - REGISTER_PLUGIN_STATIC(PEGASUS, PLUGIN_TYPE_ENGINE, PegasusMetaEngineConnect); -#endif \ No newline at end of file + REGISTER_PLUGIN_STATIC(PEGASUS, PLUGIN_TYPE_ENGINE, PegasusMetaEngine); +#endif diff --git a/engines/petka/detection.cpp b/engines/petka/detection.cpp index ee2db73a333..77e19299f27 100644 --- a/engines/petka/detection.cpp +++ b/engines/petka/detection.cpp @@ -33,9 +33,9 @@ static const PlainGameDescriptor petkaGames[] = { #include "petka/detection_tables.h" -class PetkaMetaEngine : public AdvancedMetaEngine { +class PetkaMetaEngineStatic : public AdvancedMetaEngineStatic { public: - PetkaMetaEngine() : AdvancedMetaEngine(Petka::gameDescriptions, sizeof(ADGameDescription), petkaGames) { + PetkaMetaEngineStatic() : AdvancedMetaEngineStatic(Petka::gameDescriptions, sizeof(ADGameDescription), petkaGames) { _gameIds = petkaGames; _maxScanDepth = 2; } @@ -53,4 +53,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(PETKA_DETECTION, PLUGIN_TYPE_METAENGINE, PetkaMetaEngine); +REGISTER_PLUGIN_STATIC(PETKA_DETECTION, PLUGIN_TYPE_METAENGINE, PetkaMetaEngineStatic); diff --git a/engines/petka/metaengine.cpp b/engines/petka/metaengine.cpp index c4adc642967..18c3729ca67 100644 --- a/engines/petka/metaengine.cpp +++ b/engines/petka/metaengine.cpp @@ -27,7 +27,7 @@ #include "petka/petka.h" -class PetkaMetaEngineConnect : public AdvancedMetaEngineConnect { +class PetkaMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "petka"; @@ -41,7 +41,7 @@ public: virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool PetkaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool PetkaMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -51,7 +51,7 @@ bool PetkaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSavesSupportPlayTime); } -SaveStateList PetkaMetaEngineConnect::listSaves(const char *target) const { +SaveStateList PetkaMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::String pattern = Common::String::format("%s.s##", target); Common::StringArray filenames = saveFileMan->listSavefiles(pattern); @@ -76,11 +76,11 @@ SaveStateList PetkaMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void PetkaMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void PetkaMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Petka::generateSaveName(slot, target)); } -SaveStateDescriptor PetkaMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor PetkaMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::ScopedPtr f(g_system->getSavefileManager()->openForLoading(Petka::generateSaveName(slot, target))); if (f) { @@ -94,7 +94,7 @@ SaveStateDescriptor PetkaMetaEngineConnect::querySaveMetaInfos(const char *targe return SaveStateDescriptor(); } -bool PetkaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool PetkaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new Petka::PetkaEngine(syst, desc); @@ -102,7 +102,7 @@ bool PetkaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, cons } #if PLUGIN_ENABLED_DYNAMIC(PETKA) - REGISTER_PLUGIN_DYNAMIC(PETKA, PLUGIN_TYPE_ENGINE, PetkaMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(PETKA, PLUGIN_TYPE_ENGINE, PetkaMetaEngine); #else - REGISTER_PLUGIN_STATIC(PETKA, PLUGIN_TYPE_ENGINE, PetkaMetaEngineConnect); + REGISTER_PLUGIN_STATIC(PETKA, PLUGIN_TYPE_ENGINE, PetkaMetaEngine); #endif diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp index c6ffafa3240..4d34fc7227f 100644 --- a/engines/pink/detection.cpp +++ b/engines/pink/detection.cpp @@ -38,9 +38,9 @@ static const char *directoryGlobs[] = { }; -class PinkMetaEngine : public AdvancedMetaEngine { +class PinkMetaEngineStatic : public AdvancedMetaEngineStatic { public: - PinkMetaEngine() : AdvancedMetaEngine(Pink::gameDescriptions, sizeof(ADGameDescription), pinkGames) { + PinkMetaEngineStatic() : AdvancedMetaEngineStatic(Pink::gameDescriptions, sizeof(ADGameDescription), pinkGames) { _gameIds = pinkGames; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; @@ -59,4 +59,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(PINK_DETECTION, PLUGIN_TYPE_METAENGINE, PinkMetaEngine); +REGISTER_PLUGIN_STATIC(PINK_DETECTION, PLUGIN_TYPE_METAENGINE, PinkMetaEngineStatic); diff --git a/engines/pink/metaengine.cpp b/engines/pink/metaengine.cpp index 3891e7049d2..3ccc3723483 100644 --- a/engines/pink/metaengine.cpp +++ b/engines/pink/metaengine.cpp @@ -34,7 +34,7 @@ Common::Language PinkEngine::getLanguage() const { } // End of Namespace Pink -class PinkMetaEngineConnect : public AdvancedMetaEngineConnect { +class PinkMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "pink"; @@ -50,7 +50,7 @@ public: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; }; -bool PinkMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool PinkMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsDeleteSave) || @@ -62,7 +62,7 @@ bool PinkMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -SaveStateList PinkMetaEngineConnect::listSaves(const char *target) const { +SaveStateList PinkMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::String pattern = Common::String::format("%s.s##", target); Common::StringArray filenames = saveFileMan->listSavefiles(pattern); @@ -87,11 +87,11 @@ SaveStateList PinkMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void PinkMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void PinkMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Pink::generateSaveName(slot, target)); } -SaveStateDescriptor PinkMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor PinkMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::ScopedPtr f(g_system->getSavefileManager()->openForLoading(Pink::generateSaveName(slot, target))); if (f) { @@ -105,7 +105,7 @@ SaveStateDescriptor PinkMetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -bool PinkMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool PinkMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new Pink::PinkEngine(syst, desc); @@ -113,8 +113,8 @@ bool PinkMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(PINK) - REGISTER_PLUGIN_DYNAMIC(PINK, PLUGIN_TYPE_ENGINE, PinkMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(PINK, PLUGIN_TYPE_ENGINE, PinkMetaEngine); #else - REGISTER_PLUGIN_STATIC(PINK, PLUGIN_TYPE_ENGINE, PinkMetaEngineConnect); + REGISTER_PLUGIN_STATIC(PINK, PLUGIN_TYPE_ENGINE, PinkMetaEngine); #endif diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp index 435b0f1b68d..70c49f56ced 100644 --- a/engines/plumbers/detection.cpp +++ b/engines/plumbers/detection.cpp @@ -62,9 +62,9 @@ static const ADGameDescription gameDescriptions[] = { } // End of namespace Plumbers -class PlumbersMetaEngine : public AdvancedMetaEngine { +class PlumbersMetaEngineStatic : public AdvancedMetaEngineStatic { public: - PlumbersMetaEngine() : AdvancedMetaEngine(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) { + PlumbersMetaEngineStatic() : AdvancedMetaEngineStatic(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) { } const char *getEngineId() const override { @@ -80,4 +80,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(PLUMBERS_DETECTION, PLUGIN_TYPE_METAENGINE, PlumbersMetaEngine); +REGISTER_PLUGIN_STATIC(PLUMBERS_DETECTION, PLUGIN_TYPE_METAENGINE, PlumbersMetaEngineStatic); diff --git a/engines/plumbers/metaengine.cpp b/engines/plumbers/metaengine.cpp index a5c745c1227..fd775cc8556 100644 --- a/engines/plumbers/metaengine.cpp +++ b/engines/plumbers/metaengine.cpp @@ -31,7 +31,7 @@ const char *PlumbersGame::getGameId() const { return _gameDescription->gameId; } Common::Platform PlumbersGame::getPlatform() const { return _gameDescription->platform; } } // End of namespace Plumbers -class PlumbersMetaEngineConnect : public AdvancedMetaEngineConnect { +class PlumbersMetaEngine : public AdvancedMetaEngine { const char *getName() const override { return "plumbers"; } @@ -40,19 +40,19 @@ class PlumbersMetaEngineConnect : public AdvancedMetaEngineConnect { bool hasFeature(MetaEngineFeature f) const override; }; -bool PlumbersMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool PlumbersMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) *engine = new Plumbers::PlumbersGame(syst, desc); return desc != nullptr; } -bool PlumbersMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool PlumbersMetaEngine::hasFeature(MetaEngineFeature f) const { return false; } #if PLUGIN_ENABLED_DYNAMIC(PLUMBERS) - REGISTER_PLUGIN_DYNAMIC(PLUMBERS, PLUGIN_TYPE_ENGINE, PlumbersMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(PLUMBERS, PLUGIN_TYPE_ENGINE, PlumbersMetaEngine); #else - REGISTER_PLUGIN_STATIC(PLUMBERS, PLUGIN_TYPE_ENGINE, PlumbersMetaEngineConnect); + REGISTER_PLUGIN_STATIC(PLUMBERS, PLUGIN_TYPE_ENGINE, PlumbersMetaEngine); #endif diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp index e04048e5fbd..8de21131460 100644 --- a/engines/prince/detection.cpp +++ b/engines/prince/detection.cpp @@ -121,9 +121,9 @@ const static char *directoryGlobs[] = { 0 }; -class PrinceMetaEngine : public AdvancedMetaEngine { +class PrinceMetaEngineStatic : public AdvancedMetaEngineStatic { public: - PrinceMetaEngine() : AdvancedMetaEngine(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) { + PrinceMetaEngineStatic() : AdvancedMetaEngineStatic(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) { _maxScanDepth = 2; _directoryGlobs = directoryGlobs; } @@ -141,4 +141,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(PRINCE_DETECTION, PLUGIN_TYPE_METAENGINE, PrinceMetaEngine); +REGISTER_PLUGIN_STATIC(PRINCE_DETECTION, PLUGIN_TYPE_METAENGINE, PrinceMetaEngineStatic); diff --git a/engines/prince/metaengine.cpp b/engines/prince/metaengine.cpp index 23ea7e7667f..810dec7070e 100644 --- a/engines/prince/metaengine.cpp +++ b/engines/prince/metaengine.cpp @@ -44,7 +44,7 @@ Common::Language PrinceEngine::getLanguage() const { } // End of namespace Prince -class PrinceMetaEngineConnect : public AdvancedMetaEngineConnect { +class PrinceMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "prince"; @@ -59,7 +59,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool PrinceMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool PrinceMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsDeleteSave) || (f == kSavesSupportMetaInfo) || @@ -78,7 +78,7 @@ bool Prince::PrinceEngine::hasFeature(EngineFeature f) const { (f == kSupportsReturnToLauncher); } -SaveStateList PrinceMetaEngineConnect::listSaves(const char *target) const { +SaveStateList PrinceMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -120,7 +120,7 @@ SaveStateList PrinceMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor PrinceMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +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); @@ -154,12 +154,12 @@ SaveStateDescriptor PrinceMetaEngineConnect::querySaveMetaInfos(const char *targ return SaveStateDescriptor(); } -void PrinceMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void PrinceMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -bool PrinceMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool PrinceMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { using namespace Prince; const PrinceGameDescription *gd = (const PrinceGameDescription *)desc; if (gd) { @@ -169,7 +169,7 @@ bool PrinceMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con } #if PLUGIN_ENABLED_DYNAMIC(PRINCE) - REGISTER_PLUGIN_DYNAMIC(PRINCE, PLUGIN_TYPE_ENGINE, PrinceMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(PRINCE, PLUGIN_TYPE_ENGINE, PrinceMetaEngine); #else - REGISTER_PLUGIN_STATIC(PRINCE, PLUGIN_TYPE_ENGINE, PrinceMetaEngineConnect); + REGISTER_PLUGIN_STATIC(PRINCE, PLUGIN_TYPE_ENGINE, PrinceMetaEngine); #endif diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp index ccafc68a471..f6afbb9cb5c 100644 --- a/engines/queen/detection.cpp +++ b/engines/queen/detection.cpp @@ -468,9 +468,9 @@ static const QueenGameDescription gameDescriptions[] = { } // End of namespace Queen -class QueenMetaEngine : public AdvancedMetaEngine { +class QueenMetaEngineStatic : public AdvancedMetaEngineStatic { public: - QueenMetaEngine() : AdvancedMetaEngine(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { + QueenMetaEngineStatic() : AdvancedMetaEngineStatic(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) { } const char *getEngineId() const override { @@ -488,7 +488,7 @@ public: ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override; }; -ADDetectedGame QueenMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame QueenMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { static ADGameDescription desc; // Iterate over all files in the given directory @@ -532,4 +532,4 @@ ADDetectedGame QueenMetaEngine::fallbackDetect(const FileMap &allFiles, const Co return ADDetectedGame(); } -REGISTER_PLUGIN_STATIC(QUEEN_DETECTION, PLUGIN_TYPE_METAENGINE, QueenMetaEngine); +REGISTER_PLUGIN_STATIC(QUEEN_DETECTION, PLUGIN_TYPE_METAENGINE, QueenMetaEngineStatic); diff --git a/engines/queen/metaengine.cpp b/engines/queen/metaengine.cpp index 8cdbbecda3e..f1cdaded692 100644 --- a/engines/queen/metaengine.cpp +++ b/engines/queen/metaengine.cpp @@ -29,7 +29,7 @@ #include "queen/resource.h" #include "queen/detection.h" -class QueenMetaEngineConnect : public AdvancedMetaEngineConnect { +class QueenMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "queen"; @@ -43,14 +43,14 @@ public: int getAutosaveSlot() const override { return 99; } }; -bool QueenMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool QueenMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave); } -SaveStateList QueenMetaEngineConnect::listSaves(const char *target) const { +SaveStateList QueenMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; char saveDesc[32]; @@ -80,13 +80,13 @@ SaveStateList QueenMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void QueenMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void QueenMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("queen.s%02d", slot); g_system->getSavefileManager()->removeSavefile(filename); } -bool QueenMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool QueenMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Queen::QueenGameDescription *gd = (const Queen::QueenGameDescription *)desc; if (gd) @@ -96,8 +96,8 @@ bool QueenMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, cons } #if PLUGIN_ENABLED_DYNAMIC(QUEEN) - REGISTER_PLUGIN_DYNAMIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); #else - REGISTER_PLUGIN_STATIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngineConnect); + REGISTER_PLUGIN_STATIC(QUEEN, PLUGIN_TYPE_ENGINE, QueenMetaEngine); #endif diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index dec4adde279..25b58f254ad 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -37,9 +37,9 @@ static const PlainGameDescriptor sagaGames[] = { #include "saga/detection_tables.h" -class SagaMetaEngine : public AdvancedMetaEngine { +class SagaMetaEngineStatic : public AdvancedMetaEngineStatic { public: - SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { + SagaMetaEngineStatic() : AdvancedMetaEngineStatic(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) { } const char *getEngineId() const override { @@ -73,4 +73,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(SAGA_DETECTION, PLUGIN_TYPE_METAENGINE, SagaMetaEngine); +REGISTER_PLUGIN_STATIC(SAGA_DETECTION, PLUGIN_TYPE_METAENGINE, SagaMetaEngineStatic); diff --git a/engines/saga/metaengine.cpp b/engines/saga/metaengine.cpp index 43d8b6bceb3..0e6244d5102 100644 --- a/engines/saga/metaengine.cpp +++ b/engines/saga/metaengine.cpp @@ -69,7 +69,7 @@ const ADGameFileDescription *SagaEngine::getFilesDescriptions() const { return _ } // End of namespace Saga -class SagaMetaEngineConnect : public AdvancedMetaEngineConnect { +class SagaMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "saga"; @@ -78,7 +78,7 @@ public: bool hasFeature(MetaEngineFeature f) const override; Common::Error createInstance(OSystem *syst, Engine **engine) const override { - return AdvancedMetaEngineConnect::createInstance(syst, engine); + return AdvancedMetaEngine::createInstance(syst, engine); } bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; @@ -88,7 +88,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool SagaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool SagaMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -107,7 +107,7 @@ bool Saga::SagaEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool SagaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool SagaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Saga::SAGAGameDescription *gd = (const Saga::SAGAGameDescription *)desc; if (gd) { *engine = new Saga::SagaEngine(syst, gd); @@ -115,7 +115,7 @@ bool SagaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } -SaveStateList SagaMetaEngineConnect::listSaves(const char *target) const { +SaveStateList SagaMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; char saveDesc[SAVE_TITLE_SIZE]; @@ -147,16 +147,16 @@ SaveStateList SagaMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int SagaMetaEngineConnect::getMaximumSaveSlot() const { return MAX_SAVES - 1; } +int SagaMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES - 1; } -void SagaMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void SagaMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = target; filename += Common::String::format(".s%02d", slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor SagaMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor SagaMetaEngine::querySaveMetaInfos(const char *target, int slot) const { static char fileName[MAX_FILE_NAME]; sprintf(fileName, "%s.s%02d", target, slot); char title[TITLESIZE]; @@ -231,9 +231,9 @@ SaveStateDescriptor SagaMetaEngineConnect::querySaveMetaInfos(const char *target } #if PLUGIN_ENABLED_DYNAMIC(SAGA) - REGISTER_PLUGIN_DYNAMIC(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngine); #else - REGISTER_PLUGIN_STATIC(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SAGA, PLUGIN_TYPE_ENGINE, SagaMetaEngine); #endif namespace Saga { diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index fab0ccd9066..b1122debc59 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -403,9 +403,9 @@ bool OptionsWidget::save() { return true; } -class SciMetaEngine : public AdvancedMetaEngine { +class SciMetaEngineStatic : public AdvancedMetaEngineStatic { public: - SciMetaEngine() : AdvancedMetaEngine(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) { + SciMetaEngineStatic() : AdvancedMetaEngineStatic(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) { _maxScanDepth = 3; _directoryGlobs = directoryGlobs; _matchFullPaths = true; @@ -434,18 +434,18 @@ public: GUI::OptionsContainerWidget *buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override; }; -void SciMetaEngine::registerDefaultSettings(const Common::String &target) const { - AdvancedMetaEngine::registerDefaultSettings(target); +void SciMetaEngineStatic::registerDefaultSettings(const Common::String &target) const { + AdvancedMetaEngineStatic::registerDefaultSettings(target); for (const PopUpOptionsMap *entry = popUpOptionsList; entry->guioFlag; ++entry) ConfMan.registerDefault(entry->configOption, entry->defaultState); } -GUI::OptionsContainerWidget *SciMetaEngine::buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const { +GUI::OptionsContainerWidget *SciMetaEngineStatic::buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const { return new OptionsWidget(boss, name, target); } -ADDetectedGame SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame SciMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { /** * Fallback detection for Sci heavily depends on engine resources, so it's not possible * to use them without the engine present in a clean way. @@ -455,7 +455,7 @@ ADDetectedGame SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Comm if (metaEnginePlugin) { const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin); if (enginePlugin) { - return enginePlugin->get().fallbackDetectExtern(_md5Bytes, allFiles, fslist); + return enginePlugin->get().fallbackDetectExtern(_md5Bytes, allFiles, fslist); } else { static bool warn = true; if (warn) { @@ -470,4 +470,4 @@ ADDetectedGame SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Comm } // End of namespace Sci -REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_METAENGINE, Sci::SciMetaEngine); +REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_METAENGINE, Sci::SciMetaEngineStatic); diff --git a/engines/sci/metaengine.cpp b/engines/sci/metaengine.cpp index c5ec465f60f..73f0a9d6258 100644 --- a/engines/sci/metaengine.cpp +++ b/engines/sci/metaengine.cpp @@ -296,7 +296,7 @@ static Common::String convertSierraGameId(Common::String sierraId, uint32 *gameF namespace Sci { -class SciMetaEngineConnect : public AdvancedMetaEngineConnect { +class SciMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "sci"; @@ -315,7 +315,7 @@ public: virtual ADDetectedGame fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist) const override; }; -bool SciMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool SciMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const GameIdStrToEnum *g = s_gameIdStrToEnum; for (; g->gameidStr; ++g) { if (0 == strcmp(desc->gameId, g->gameidStr)) { @@ -327,7 +327,7 @@ bool SciMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return false; } -bool SciMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool SciMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -352,7 +352,7 @@ bool SciEngine::hasFeature(EngineFeature f) const { // and some other times it won't work. } -SaveStateList SciMetaEngineConnect::listSaves(const char *target) const { +SaveStateList SciMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -403,7 +403,7 @@ SaveStateList SciMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor SciMetaEngineConnect::querySaveMetaInfos(const char *target, int slotNr) const { +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); SaveStateDescriptor descriptor(slotNr, ""); @@ -465,9 +465,9 @@ SaveStateDescriptor SciMetaEngineConnect::querySaveMetaInfos(const char *target, return descriptor; } -int SciMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int SciMetaEngine::getMaximumSaveSlot() const { return 99; } -void SciMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void SciMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } @@ -548,7 +548,7 @@ static ADGameDescription s_fallbackDesc = { GUIO3(GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_MIDI_MODE) }; -ADDetectedGame SciMetaEngineConnect::fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame SciMetaEngine::fallbackDetectExtern(uint md5Bytes, const FileMap &allFiles, const Common::FSList &fslist) const { bool foundResMap = false; bool foundRes000 = false; @@ -716,7 +716,7 @@ ADDetectedGame SciMetaEngineConnect::fallbackDetectExtern(uint md5Bytes, const F } // End of namespace Sci #if PLUGIN_ENABLED_DYNAMIC(SCI) - REGISTER_PLUGIN_DYNAMIC(SCI, PLUGIN_TYPE_ENGINE, Sci::SciMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SCI, PLUGIN_TYPE_ENGINE, Sci::SciMetaEngine); #else - REGISTER_PLUGIN_STATIC(SCI, PLUGIN_TYPE_ENGINE, Sci::SciMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SCI, PLUGIN_TYPE_ENGINE, Sci::SciMetaEngine); #endif diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 0b316898b75..edae12e2a7e 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -54,7 +54,7 @@ using namespace Scumm; -class ScummMetaEngine : public MetaEngine { +class ScummMetaEngineStatic : public MetaEngineStatic { public: const char *getEngineId() const override { return "scumm"; @@ -70,11 +70,11 @@ public: const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override; }; -PlainGameList ScummMetaEngine::getSupportedGames() const { +PlainGameList ScummMetaEngineStatic::getSupportedGames() const { return PlainGameList(gameDescriptions); } -PlainGameDescriptor ScummMetaEngine::findGame(const char *gameid) const { +PlainGameDescriptor ScummMetaEngineStatic::findGame(const char *gameid) const { return Engines::findGameID(gameid, gameDescriptions, obsoleteGameIDsTable); } @@ -104,7 +104,7 @@ static Common::String generatePreferredTarget(const DetectorResult &x) { return res; } -DetectedGames ScummMetaEngine::detectGames(const Common::FSList &fslist) const { +DetectedGames ScummMetaEngineStatic::detectGames(const Common::FSList &fslist) const { DetectedGames detectedGames; Common::List results; ::detectGames(fslist, results, 0); @@ -129,7 +129,7 @@ DetectedGames ScummMetaEngine::detectGames(const Common::FSList &fslist) const { return detectedGames; } -const char *ScummMetaEngine::getName() const { +const char *ScummMetaEngineStatic::getName() const { return "SCUMM [" #if defined(ENABLE_SCUMM_7_8) && defined(ENABLE_HE) @@ -149,7 +149,7 @@ const char *ScummMetaEngine::getName() const { "]"; } -const char *ScummMetaEngine::getOriginalCopyright() const { +const char *ScummMetaEngineStatic::getOriginalCopyright() const { return "LucasArts SCUMM Games (C) LucasArts\n" "Humongous SCUMM Games (C) Humongous"; } @@ -168,7 +168,7 @@ static const ExtraGuiOption mmnesObjectLabelsOption = { false }; -const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions ScummMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; if (target.empty() || ConfMan.get("gameid", target) == "comi") { options.push_back(comiObjectLabelsOption); @@ -179,4 +179,4 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String & return options; } -REGISTER_PLUGIN_STATIC(SCUMM_DETECTION, PLUGIN_TYPE_METAENGINE, ScummMetaEngine); +REGISTER_PLUGIN_STATIC(SCUMM_DETECTION, PLUGIN_TYPE_METAENGINE, ScummMetaEngineStatic); diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp index 027287ede06..e6af0f9cd42 100644 --- a/engines/scumm/metaengine.cpp +++ b/engines/scumm/metaengine.cpp @@ -216,11 +216,11 @@ bool ScummEngine::isMacM68kIMuse() const { using namespace Scumm; -const char *ScummMetaEngineConnect::getName() const { +const char *ScummMetaEngine::getName() const { return "Scumm"; } -bool ScummMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -246,7 +246,7 @@ bool ScummEngine::hasFeature(EngineFeature f) const { * * This is heavily based on our MD5 detection scheme. */ -Common::Error ScummMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { +Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) const { assert(syst); assert(engine); const char *gameid = ConfMan.get("gameid").c_str(); @@ -440,13 +440,13 @@ Common::Error ScummMetaEngineConnect::createInstance(OSystem *syst, Engine **eng return Common::kNoError; } -int ScummMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int ScummMetaEngine::getMaximumSaveSlot() const { return 99; } namespace Scumm { bool getSavegameName(Common::InSaveFile *in, Common::String &desc, int heversion); } // End of namespace Scumm -SaveStateList ScummMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ScummMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -475,12 +475,12 @@ SaveStateList ScummMetaEngineConnect::listSaves(const char *target) const { return saveList; } -void ScummMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ScummMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = ScummEngine::makeSavegameName(target, slot, false); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor ScummMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String saveDesc; Graphics::Surface *thumbnail = nullptr; SaveStateMetaInfos infos; @@ -521,7 +521,7 @@ SaveStateDescriptor ScummMetaEngineConnect::querySaveMetaInfos(const char *targe } #if PLUGIN_ENABLED_DYNAMIC(SCUMM) - REGISTER_PLUGIN_DYNAMIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine); #else - REGISTER_PLUGIN_STATIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SCUMM, PLUGIN_TYPE_ENGINE, ScummMetaEngine); #endif diff --git a/engines/scumm/metaengine.h b/engines/scumm/metaengine.h index af18d934cc7..d7f190a31b9 100644 --- a/engines/scumm/metaengine.h +++ b/engines/scumm/metaengine.h @@ -25,7 +25,7 @@ #include "engines/metaengine.h" -class ScummMetaEngineConnect : public MetaEngineConnect { +class ScummMetaEngine : public MetaEngine { virtual const char *getName() const override; bool hasFeature(MetaEngineFeature f) const override; diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp index 7047838e24e..3e3bc162c8c 100644 --- a/engines/sherlock/detection.cpp +++ b/engines/sherlock/detection.cpp @@ -121,9 +121,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { #include "sherlock/detection_tables.h" -class SherlockMetaEngine : public AdvancedMetaEngine { +class SherlockMetaEngineStatic : public AdvancedMetaEngineStatic { public: - SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription), + SherlockMetaEngineStatic() : AdvancedMetaEngineStatic(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription), sherlockGames, optionsList) {} const char *getEngineId() const override { @@ -140,4 +140,4 @@ public: }; -REGISTER_PLUGIN_STATIC(SHERLOCK_DETECTION, PLUGIN_TYPE_METAENGINE, SherlockMetaEngine); +REGISTER_PLUGIN_STATIC(SHERLOCK_DETECTION, PLUGIN_TYPE_METAENGINE, SherlockMetaEngineStatic); diff --git a/engines/sherlock/metaengine.cpp b/engines/sherlock/metaengine.cpp index e5fa0f1ea65..6ce20297359 100644 --- a/engines/sherlock/metaengine.cpp +++ b/engines/sherlock/metaengine.cpp @@ -48,7 +48,7 @@ Common::Language SherlockEngine::getLanguage() const { } // End of namespace Sherlock -class SherlockMetaEngineConnect : public AdvancedMetaEngineConnect { +class SherlockMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "sherlock"; @@ -85,7 +85,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool SherlockMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Sherlock::SherlockGameDescription *gd = (const Sherlock::SherlockGameDescription *)desc; if (gd) { switch (gd->gameID) { @@ -103,7 +103,7 @@ bool SherlockMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c return gd != 0; } -bool SherlockMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool SherlockMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -126,20 +126,20 @@ bool Sherlock::SherlockEngine::isDemo() const { return _gameDescription->desc.flags & ADGF_DEMO; } -SaveStateList SherlockMetaEngineConnect::listSaves(const char *target) const { +SaveStateList SherlockMetaEngine::listSaves(const char *target) const { return Sherlock::SaveManager::getSavegameList(target); } -int SherlockMetaEngineConnect::getMaximumSaveSlot() const { +int SherlockMetaEngine::getMaximumSaveSlot() const { return MAX_SAVEGAME_SLOTS; } -void SherlockMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void SherlockMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor SherlockMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor SherlockMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Sherlock::SaveManager(nullptr, target).generateSaveName(slot); Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(filename); @@ -165,7 +165,7 @@ SaveStateDescriptor SherlockMetaEngineConnect::querySaveMetaInfos(const char *ta } #if PLUGIN_ENABLED_DYNAMIC(SHERLOCK) - REGISTER_PLUGIN_DYNAMIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine); #else - REGISTER_PLUGIN_STATIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SHERLOCK, PLUGIN_TYPE_ENGINE, SherlockMetaEngine); #endif diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index 8db7d3f35d7..e8140589fb0 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -65,7 +65,7 @@ static const SkyVersion skyVersions[] = { { 0, 0, 0, 0, 0 } }; -class SkyMetaEngine : public MetaEngine { +class SkyMetaEngineStatic : public MetaEngineStatic { public: const char *getName() const override; const char *getOriginalCopyright() const override; @@ -80,21 +80,21 @@ public: DetectedGames detectGames(const Common::FSList &fslist) const override; }; -const char *SkyMetaEngine::getName() const { +const char *SkyMetaEngineStatic::getName() const { return "Beneath a Steel Sky"; } -const char *SkyMetaEngine::getOriginalCopyright() const { +const char *SkyMetaEngineStatic::getOriginalCopyright() const { return "Beneath a Steel Sky (C) Revolution"; } -PlainGameList SkyMetaEngine::getSupportedGames() const { +PlainGameList SkyMetaEngineStatic::getSupportedGames() const { PlainGameList games; games.push_back(skySetting); return games; } -const ExtraGuiOptions SkyMetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions SkyMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { Common::String guiOptions; ExtraGuiOptions options; @@ -113,13 +113,13 @@ const ExtraGuiOptions SkyMetaEngine::getExtraGuiOptions(const Common::String &ta return options; } -PlainGameDescriptor SkyMetaEngine::findGame(const char *gameid) const { +PlainGameDescriptor SkyMetaEngineStatic::findGame(const char *gameid) const { if (0 == scumm_stricmp(gameid, skySetting.gameId)) return skySetting; return PlainGameDescriptor::empty(); } -DetectedGames SkyMetaEngine::detectGames(const Common::FSList &fslist) const { +DetectedGames SkyMetaEngineStatic::detectGames(const Common::FSList &fslist) const { DetectedGames detectedGames; bool hasSkyDsk = false; bool hasSkyDnr = false; @@ -175,4 +175,4 @@ DetectedGames SkyMetaEngine::detectGames(const Common::FSList &fslist) const { return detectedGames; } -REGISTER_PLUGIN_STATIC(SKY_DETECTION, PLUGIN_TYPE_METAENGINE, SkyMetaEngine); +REGISTER_PLUGIN_STATIC(SKY_DETECTION, PLUGIN_TYPE_METAENGINE, SkyMetaEngineStatic); diff --git a/engines/sky/metaengine.cpp b/engines/sky/metaengine.cpp index f4708e8f307..c1ba427048e 100644 --- a/engines/sky/metaengine.cpp +++ b/engines/sky/metaengine.cpp @@ -35,7 +35,7 @@ #include "sky/control.h" #include "sky/sky.h" -class SkyMetaEngineConnect : public MetaEngineConnect { +class SkyMetaEngine : public MetaEngine { const char *getName() const override { return "sky"; } @@ -51,7 +51,7 @@ class SkyMetaEngineConnect : public MetaEngineConnect { Common::KeymapArray initKeymaps(const char *target) const override; }; -bool SkyMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool SkyMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -65,7 +65,7 @@ bool Sky::SkyEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -Common::KeymapArray SkyMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray SkyMetaEngine::initKeymaps(const char *target) const { using namespace Common; using namespace Sky; @@ -132,13 +132,13 @@ Common::KeymapArray SkyMetaEngineConnect::initKeymaps(const char *target) const return keymaps; } -Common::Error SkyMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { +Common::Error SkyMetaEngine::createInstance(OSystem *syst, Engine **engine) const { assert(engine); *engine = new Sky::SkyEngine(syst); return Common::kNoError; } -SaveStateList SkyMetaEngineConnect::listSaves(const char *target) const { +SaveStateList SkyMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); SaveStateList saveList; @@ -183,9 +183,9 @@ SaveStateList SkyMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int SkyMetaEngineConnect::getMaximumSaveSlot() const { return MAX_SAVE_GAMES; } +int SkyMetaEngine::getMaximumSaveSlot() const { return MAX_SAVE_GAMES; } -void SkyMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void SkyMetaEngine::removeSaveState(const char *target, int slot) const { if (slot == 0) // do not delete the auto save return; @@ -233,9 +233,9 @@ void SkyMetaEngineConnect::removeSaveState(const char *target, int slot) const { } #if PLUGIN_ENABLED_DYNAMIC(SKY) - REGISTER_PLUGIN_DYNAMIC(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngine); #else - REGISTER_PLUGIN_STATIC(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SKY, PLUGIN_TYPE_ENGINE, SkyMetaEngine); #endif namespace Sky { diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp index 8ab37da31c3..c5392f600fb 100644 --- a/engines/sludge/detection.cpp +++ b/engines/sludge/detection.cpp @@ -65,9 +65,9 @@ static Sludge::SludgeGameDescription s_fallbackDesc = static char s_fallbackFileNameBuffer[51]; -class SludgeMetaEngine : public AdvancedMetaEngine { +class SludgeMetaEngineStatic : public AdvancedMetaEngineStatic { public: - SludgeMetaEngine() : AdvancedMetaEngine(Sludge::gameDescriptions, sizeof(Sludge::SludgeGameDescription), sludgeGames) { + SludgeMetaEngineStatic() : AdvancedMetaEngineStatic(Sludge::gameDescriptions, sizeof(Sludge::SludgeGameDescription), sludgeGames) { _maxScanDepth = 1; } @@ -87,7 +87,7 @@ public: ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override; }; -ADDetectedGame SludgeMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { +ADDetectedGame SludgeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { // reset fallback description s_fallbackDesc.desc.gameId = "sludge"; s_fallbackDesc.desc.extra = ""; @@ -146,4 +146,4 @@ ADDetectedGame SludgeMetaEngine::fallbackDetect(const FileMap &allFiles, const C return ADDetectedGame(); } -REGISTER_PLUGIN_STATIC(SLUDGE_DETECTION, PLUGIN_TYPE_METAENGINE, SludgeMetaEngine); +REGISTER_PLUGIN_STATIC(SLUDGE_DETECTION, PLUGIN_TYPE_METAENGINE, SludgeMetaEngineStatic); diff --git a/engines/sludge/metaengine.cpp b/engines/sludge/metaengine.cpp index 96385daea52..26f9295a538 100644 --- a/engines/sludge/metaengine.cpp +++ b/engines/sludge/metaengine.cpp @@ -40,7 +40,7 @@ const char *SludgeEngine::getGameFile() const { } // End of namespace Sludge -class SludgeMetaEngineConnect : public AdvancedMetaEngineConnect { +class SludgeMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "sludge"; @@ -56,7 +56,7 @@ public: }; #if PLUGIN_ENABLED_DYNAMIC(SLUDGE) - REGISTER_PLUGIN_DYNAMIC(SLUDGE, PLUGIN_TYPE_ENGINE, SludgeMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SLUDGE, PLUGIN_TYPE_ENGINE, SludgeMetaEngine); #else - REGISTER_PLUGIN_STATIC(SLUDGE, PLUGIN_TYPE_ENGINE, SludgeMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SLUDGE, PLUGIN_TYPE_ENGINE, SludgeMetaEngine); #endif diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp index 587fda7115f..73caac797e2 100644 --- a/engines/startrek/detection.cpp +++ b/engines/startrek/detection.cpp @@ -287,9 +287,9 @@ static const StarTrekGameDescription gameDescriptions[] = { } // End of namespace StarTrek -class StarTrekMetaEngine : public AdvancedMetaEngine { +class StarTrekMetaEngineStatic : public AdvancedMetaEngineStatic { public: - StarTrekMetaEngine() : AdvancedMetaEngine(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) { + StarTrekMetaEngineStatic() : AdvancedMetaEngineStatic(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) { } const char *getEngineId() const override { @@ -307,4 +307,4 @@ public: -REGISTER_PLUGIN_STATIC(STARTREK_DETECTION, PLUGIN_TYPE_METAENGINE, StarTrekMetaEngine); +REGISTER_PLUGIN_STATIC(STARTREK_DETECTION, PLUGIN_TYPE_METAENGINE, StarTrekMetaEngineStatic); diff --git a/engines/startrek/metaengine.cpp b/engines/startrek/metaengine.cpp index f7c5007a628..37756293588 100644 --- a/engines/startrek/metaengine.cpp +++ b/engines/startrek/metaengine.cpp @@ -54,7 +54,7 @@ Common::Language StarTrekEngine::getLanguage() const { } // End of Namespace StarTrek -class StarTrekMetaEngineConnect : public AdvancedMetaEngineConnect { +class StarTrekMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "startrek"; @@ -69,7 +69,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool StarTrekMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool StarTrekMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -81,7 +81,7 @@ bool StarTrekMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -bool StarTrekMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool StarTrekMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const StarTrek::StarTrekGameDescription *gd = (const StarTrek::StarTrekGameDescription *)desc; *engine = new StarTrek::StarTrekEngine(syst, gd); @@ -89,7 +89,7 @@ bool StarTrekMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, c return (gd != 0); } -SaveStateList StarTrekMetaEngineConnect::listSaves(const char *target) const { +SaveStateList StarTrekMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -132,16 +132,16 @@ SaveStateList StarTrekMetaEngineConnect::listSaves(const char *target) const { } -int StarTrekMetaEngineConnect::getMaximumSaveSlot() const { +int StarTrekMetaEngine::getMaximumSaveSlot() const { return 999; } -void StarTrekMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void StarTrekMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -SaveStateDescriptor StarTrekMetaEngineConnect::querySaveMetaInfos(const char *target, int slotNr) const { +SaveStateDescriptor StarTrekMetaEngine::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); @@ -200,7 +200,7 @@ SaveStateDescriptor StarTrekMetaEngineConnect::querySaveMetaInfos(const char *ta } #if PLUGIN_ENABLED_DYNAMIC(STARTREK) - REGISTER_PLUGIN_DYNAMIC(STARTREK, PLUGIN_TYPE_ENGINE, StarTrekMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(STARTREK, PLUGIN_TYPE_ENGINE, StarTrekMetaEngine); #else - REGISTER_PLUGIN_STATIC(STARTREK, PLUGIN_TYPE_ENGINE, StarTrekMetaEngineConnect); + REGISTER_PLUGIN_STATIC(STARTREK, PLUGIN_TYPE_ENGINE, StarTrekMetaEngine); #endif diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp index ed0bf4bcf3b..ef84049b023 100644 --- a/engines/supernova/detection.cpp +++ b/engines/supernova/detection.cpp @@ -101,9 +101,9 @@ static const ADGameDescription gameDescriptions[] = { }; } -class SupernovaMetaEngine: public AdvancedMetaEngine { +class SupernovaMetaEngineStatic: public AdvancedMetaEngineStatic { public: - SupernovaMetaEngine() : AdvancedMetaEngine(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) { + SupernovaMetaEngineStatic() : AdvancedMetaEngineStatic(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) { } const char *getEngineId() const override { @@ -120,4 +120,4 @@ public: }; -REGISTER_PLUGIN_STATIC(SUPERNOVA_DETECTION, PLUGIN_TYPE_METAENGINE, SupernovaMetaEngine); +REGISTER_PLUGIN_STATIC(SUPERNOVA_DETECTION, PLUGIN_TYPE_METAENGINE, SupernovaMetaEngineStatic); diff --git a/engines/supernova/metaengine.cpp b/engines/supernova/metaengine.cpp index 36c756c8c62..855a92d7691 100644 --- a/engines/supernova/metaengine.cpp +++ b/engines/supernova/metaengine.cpp @@ -31,7 +31,7 @@ #include "supernova/supernova.h" -class SupernovaMetaEngineConnect : public AdvancedMetaEngineConnect { +class SupernovaMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "supernova"; @@ -48,7 +48,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool SupernovaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool SupernovaMetaEngine::hasFeature(MetaEngineFeature f) const { switch (f) { case kSupportsLoadingDuringStartup: case kSupportsListSaves: @@ -63,7 +63,7 @@ bool SupernovaMetaEngineConnect::hasFeature(MetaEngineFeature f) const { } } -bool SupernovaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool SupernovaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Supernova::SupernovaEngine(syst); } @@ -71,7 +71,7 @@ bool SupernovaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, return desc != nullptr; } -SaveStateList SupernovaMetaEngineConnect::listSaves(const char *target) const { +SaveStateList SupernovaMetaEngine::listSaves(const char *target) const { Common::StringArray filenames; Common::String pattern; if (!strncmp(target, "msn1", 4)) @@ -109,7 +109,7 @@ SaveStateList SupernovaMetaEngineConnect::listSaves(const char *target) const { return saveFileList; } -void SupernovaMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void SupernovaMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename; if (!strncmp(target, "msn1", 4)) filename = Common::String::format("msn_save.%03d", slot); @@ -118,7 +118,7 @@ void SupernovaMetaEngineConnect::removeSaveState(const char *target, int slot) c g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor SupernovaMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor SupernovaMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName; if (!strncmp(target, "msn1", 4)) fileName = Common::String::format("msn_save.%03d", slot); @@ -177,7 +177,7 @@ SaveStateDescriptor SupernovaMetaEngineConnect::querySaveMetaInfos(const char *t } #if PLUGIN_ENABLED_DYNAMIC(SUPERNOVA) - REGISTER_PLUGIN_DYNAMIC(SUPERNOVA, PLUGIN_TYPE_ENGINE, SupernovaMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SUPERNOVA, PLUGIN_TYPE_ENGINE, SupernovaMetaEngine); #else - REGISTER_PLUGIN_STATIC(SUPERNOVA, PLUGIN_TYPE_ENGINE, SupernovaMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SUPERNOVA, PLUGIN_TYPE_ENGINE, SupernovaMetaEngine); #endif diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index abfaa575188..421cf5437eb 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -71,7 +71,7 @@ static const char *const g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files h // the engine needs several more files to work, but checking these should be sufficient }; -class SwordMetaEngine : public MetaEngine { +class SwordMetaEngineStatic : public MetaEngineStatic { public: const char *getEngineId() const override { return "sword1"; @@ -89,7 +89,7 @@ public: DetectedGames detectGames(const Common::FSList &fslist) const override; }; -PlainGameList SwordMetaEngine::getSupportedGames() const { +PlainGameList SwordMetaEngineStatic::getSupportedGames() const { PlainGameList games; games.push_back(sword1FullSettings); games.push_back(sword1DemoSettings); @@ -100,7 +100,7 @@ PlainGameList SwordMetaEngine::getSupportedGames() const { return games; } -PlainGameDescriptor SwordMetaEngine::findGame(const char *gameId) const { +PlainGameDescriptor SwordMetaEngineStatic::findGame(const char *gameId) const { if (0 == scumm_stricmp(gameId, sword1FullSettings.gameId)) return sword1FullSettings; if (0 == scumm_stricmp(gameId, sword1DemoSettings.gameId)) @@ -133,7 +133,7 @@ void Sword1CheckDirectory(const Common::FSList &fslist, bool *filesFound) { } } -DetectedGames SwordMetaEngine::detectGames(const Common::FSList &fslist) const { +DetectedGames SwordMetaEngineStatic::detectGames(const Common::FSList &fslist) const { int i, j; DetectedGames detectedGames; bool filesFound[NUM_FILES_TO_CHECK]; @@ -217,4 +217,4 @@ DetectedGames SwordMetaEngine::detectGames(const Common::FSList &fslist) const { return detectedGames; } -REGISTER_PLUGIN_STATIC(SWORD1_DETECTION, PLUGIN_TYPE_METAENGINE, SwordMetaEngine); +REGISTER_PLUGIN_STATIC(SWORD1_DETECTION, PLUGIN_TYPE_METAENGINE, SwordMetaEngineStatic); diff --git a/engines/sword1/metaengine.cpp b/engines/sword1/metaengine.cpp index 437b27fa9e9..4f95ff15c43 100644 --- a/engines/sword1/metaengine.cpp +++ b/engines/sword1/metaengine.cpp @@ -31,7 +31,7 @@ #include "engines/metaengine.h" -class SwordMetaEngineConnect : public MetaEngineConnect { +class SwordMetaEngine : public MetaEngine { public: const char *getName() const override { return "sword1"; @@ -47,7 +47,7 @@ public: Common::Error createInstance(OSystem *syst, Engine **engine) const override; }; -bool SwordMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool SwordMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -65,13 +65,13 @@ bool Sword1::SwordEngine::hasFeature(EngineFeature f) const { (f == kSupportsLoadingDuringRuntime); } -Common::Error SwordMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { +Common::Error SwordMetaEngine::createInstance(OSystem *syst, Engine **engine) const { assert(engine); *engine = new Sword1::SwordEngine(syst); return Common::kNoError; } -SaveStateList SwordMetaEngineConnect::listSaves(const char *target) const { +SaveStateList SwordMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); SaveStateList saveList; char saveName[40]; @@ -99,13 +99,13 @@ SaveStateList SwordMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int SwordMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int SwordMetaEngine::getMaximumSaveSlot() const { return 999; } -void SwordMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void SwordMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Common::String::format("sword1.%03d", slot)); } -SaveStateDescriptor SwordMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor SwordMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName = Common::String::format("sword1.%03d", slot); char name[40]; uint32 playTime = 0; @@ -163,9 +163,9 @@ SaveStateDescriptor SwordMetaEngineConnect::querySaveMetaInfos(const char *targe } #if PLUGIN_ENABLED_DYNAMIC(SWORD1) - REGISTER_PLUGIN_DYNAMIC(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngine); #else - REGISTER_PLUGIN_STATIC(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngineConnect); + REGISTER_PLUGIN_STATIC(SWORD1, PLUGIN_TYPE_ENGINE, SwordMetaEngine); #endif namespace Sword1 { diff --git a/engines/sword2/detection.cpp b/engines/sword2/detection.cpp index 9f7abb1fead..e9b6203e50e 100644 --- a/engines/sword2/detection.cpp +++ b/engines/sword2/detection.cpp @@ -36,7 +36,7 @@ static const ExtraGuiOption sword2ExtraGuiOption = { false }; -class Sword2MetaEngine : public MetaEngine { +class Sword2MetaEngineStatic : public MetaEngineStatic { public: const char *getEngineId() const override { return "sword2"; @@ -55,7 +55,7 @@ public: DetectedGames detectGames(const Common::FSList &fslist) const override; }; -PlainGameList Sword2MetaEngine::getSupportedGames() const { +PlainGameList Sword2MetaEngineStatic::getSupportedGames() const { const Sword2::GameSettings *g = Sword2::sword2_settings; PlainGameList games; while (g->gameid) { @@ -65,13 +65,13 @@ PlainGameList Sword2MetaEngine::getSupportedGames() const { return games; } -const ExtraGuiOptions Sword2MetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions Sword2MetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; options.push_back(sword2ExtraGuiOption); return options; } -PlainGameDescriptor Sword2MetaEngine::findGame(const char *gameid) const { +PlainGameDescriptor Sword2MetaEngineStatic::findGame(const char *gameid) const { const Sword2::GameSettings *g = Sword2::sword2_settings; while (g->gameid) { if (0 == scumm_stricmp(gameid, g->gameid)) @@ -81,7 +81,7 @@ PlainGameDescriptor Sword2MetaEngine::findGame(const char *gameid) const { return PlainGameDescriptor::of(g->gameid, g->description); } -DetectedGames Sword2MetaEngine::detectGames(const Common::FSList &fslist) const { +DetectedGames Sword2MetaEngineStatic::detectGames(const Common::FSList &fslist) const { // The required game data files can be located in the game directory, or in // a subdirectory called "clusters". In the latter case, we don't want to // detect the game in that subdirectory, as this will detect the game twice @@ -101,4 +101,4 @@ DetectedGames Sword2MetaEngine::detectGames(const Common::FSList &fslist) const return detectGamesImpl(fslist); } -REGISTER_PLUGIN_STATIC(SWORD2_DETECTION, PLUGIN_TYPE_METAENGINE, Sword2MetaEngine); +REGISTER_PLUGIN_STATIC(SWORD2_DETECTION, PLUGIN_TYPE_METAENGINE, Sword2MetaEngineStatic); diff --git a/engines/sword2/metaengine.cpp b/engines/sword2/metaengine.cpp index cee3d1011ea..acefded1233 100644 --- a/engines/sword2/metaengine.cpp +++ b/engines/sword2/metaengine.cpp @@ -36,7 +36,7 @@ #include "sword2/saveload.h" #include "sword2/detection_internal.h" -class Sword2MetaEngineConnect : public MetaEngineConnect { +class Sword2MetaEngine : public MetaEngine { public: const char *getName() const override { return "sword2"; @@ -51,7 +51,7 @@ public: Common::Error createInstance(OSystem *syst, Engine **engine) const override; }; -bool Sword2MetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -67,7 +67,7 @@ bool Sword2::Sword2Engine::hasFeature(EngineFeature f) const { (f == kSupportsLoadingDuringRuntime); } -SaveStateList Sword2MetaEngineConnect::listSaves(const char *target) const { +SaveStateList Sword2MetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; char saveDesc[SAVE_DESCRIPTION_LEN]; @@ -97,16 +97,16 @@ SaveStateList Sword2MetaEngineConnect::listSaves(const char *target) const { return saveList; } -int Sword2MetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int Sword2MetaEngine::getMaximumSaveSlot() const { return 999; } -void Sword2MetaEngineConnect::removeSaveState(const char *target, int slot) const { +void Sword2MetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = target; filename += Common::String::format(".%03d", slot); g_system->getSavefileManager()->removeSavefile(filename); } -Common::Error Sword2MetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { +Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) const { assert(syst); assert(engine); @@ -131,7 +131,7 @@ Common::Error Sword2MetaEngineConnect::createInstance(OSystem *syst, Engine **en } #if PLUGIN_ENABLED_DYNAMIC(SWORD2) - REGISTER_PLUGIN_DYNAMIC(SWORD2, PLUGIN_TYPE_ENGINE, Sword2MetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SWORD2, PLUGIN_TYPE_ENGINE, Sword2MetaEngine); #else - REGISTER_PLUGIN_STATIC(SWORD2, PLUGIN_TYPE_ENGINE, Sword2MetaEngineConnect); + REGISTER_PLUGIN_STATIC(SWORD2, PLUGIN_TYPE_ENGINE, Sword2MetaEngine); #endif diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index 40ac500ea25..9962cbf2c8b 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -44,9 +44,9 @@ static const ExtraGuiOption sword25ExtraGuiOption = { false }; -class Sword25MetaEngine : public AdvancedMetaEngine { +class Sword25MetaEngineStatic : public AdvancedMetaEngineStatic { public: - Sword25MetaEngine() : AdvancedMetaEngine(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) { + Sword25MetaEngineStatic() : AdvancedMetaEngineStatic(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) { _guiOptions = GUIO1(GUIO_NOMIDI); _maxScanDepth = 2; _directoryGlobs = directoryGlobs; @@ -67,10 +67,10 @@ public: const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override; }; -const ExtraGuiOptions Sword25MetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions Sword25MetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; options.push_back(sword25ExtraGuiOption); return options; } -REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_METAENGINE, Sword25MetaEngine); +REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_METAENGINE, Sword25MetaEngineStatic); diff --git a/engines/sword25/metaengine.cpp b/engines/sword25/metaengine.cpp index bc8affb9aca..0c7fc563a8d 100644 --- a/engines/sword25/metaengine.cpp +++ b/engines/sword25/metaengine.cpp @@ -31,7 +31,7 @@ uint32 Sword25Engine::getGameFlags() const { return _gameDescription->flags; } } // End of namespace Sword25 -class Sword25MetaEngineConnect : public AdvancedMetaEngineConnect { +class Sword25MetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "sword25"; @@ -44,19 +44,19 @@ public: SaveStateList listSaves(const char *target) const override; }; -bool Sword25MetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool Sword25MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Sword25::Sword25Engine(syst, desc); } return desc != 0; } -bool Sword25MetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool Sword25MetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves); } -SaveStateList Sword25MetaEngineConnect::listSaves(const char *target) const { +SaveStateList Sword25MetaEngine::listSaves(const char *target) const { Common::String pattern = target; pattern = pattern + ".###"; SaveStateList saveList; @@ -77,7 +77,7 @@ SaveStateList Sword25MetaEngineConnect::listSaves(const char *target) const { } #if PLUGIN_ENABLED_DYNAMIC(SWORD25) - REGISTER_PLUGIN_DYNAMIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngine); #else - REGISTER_PLUGIN_STATIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngineConnect); + REGISTER_PLUGIN_STATIC(SWORD25, PLUGIN_TYPE_ENGINE, Sword25MetaEngine); #endif diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index ad1b1629ea2..623603dd2e3 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -78,9 +78,9 @@ static const ADGameDescription teenAgentGameDescriptions[] = { -class TeenAgentMetaEngine : public AdvancedMetaEngine { +class TeenAgentMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TeenAgentMetaEngine() : AdvancedMetaEngine(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { + TeenAgentMetaEngineStatic() : AdvancedMetaEngineStatic(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) { } const char *getEngineId() const override { @@ -96,4 +96,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TEENAGENT_DETECTION, PLUGIN_TYPE_METAENGINE, TeenAgentMetaEngine); +REGISTER_PLUGIN_STATIC(TEENAGENT_DETECTION, PLUGIN_TYPE_METAENGINE, TeenAgentMetaEngineStatic); diff --git a/engines/teenagent/metaengine.cpp b/engines/teenagent/metaengine.cpp index 74f21474dcf..d6f3883943b 100644 --- a/engines/teenagent/metaengine.cpp +++ b/engines/teenagent/metaengine.cpp @@ -35,7 +35,7 @@ enum { MAX_SAVES = 20 }; -class TeenAgentMetaEngineConnect : public AdvancedMetaEngineConnect { +class TeenAgentMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "teenagent"; @@ -131,7 +131,7 @@ public: }; #if PLUGIN_ENABLED_DYNAMIC(TEENAGENT) - REGISTER_PLUGIN_DYNAMIC(TEENAGENT, PLUGIN_TYPE_ENGINE, TeenAgentMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TEENAGENT, PLUGIN_TYPE_ENGINE, TeenAgentMetaEngine); #else - REGISTER_PLUGIN_STATIC(TEENAGENT, PLUGIN_TYPE_ENGINE, TeenAgentMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TEENAGENT, PLUGIN_TYPE_ENGINE, TeenAgentMetaEngine); #endif diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index dcc22dc13b2..90180fc1fe0 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -42,9 +42,9 @@ static const ADGameDescription testbedDescriptions[] = { AD_TABLE_END_MARKER }; -class TestbedMetaEngine : public AdvancedMetaEngine { +class TestbedMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TestbedMetaEngine() : AdvancedMetaEngine(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { + TestbedMetaEngineStatic() : AdvancedMetaEngineStatic(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) { _md5Bytes = 512; } @@ -61,4 +61,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TESTBED_DETECTION, PLUGIN_TYPE_METAENGINE, TestbedMetaEngine); +REGISTER_PLUGIN_STATIC(TESTBED_DETECTION, PLUGIN_TYPE_METAENGINE, TestbedMetaEngineStatic); diff --git a/engines/testbed/metaengine.cpp b/engines/testbed/metaengine.cpp index b0c00692cf4..6b49b347aec 100644 --- a/engines/testbed/metaengine.cpp +++ b/engines/testbed/metaengine.cpp @@ -29,7 +29,7 @@ #include "testbed/testbed.h" #include "testbed/testsuite.h" -class TestbedMetaEngineConnect : public AdvancedMetaEngineConnect { +class TestbedMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "testbed"; @@ -65,7 +65,7 @@ public: }; #if PLUGIN_ENABLED_DYNAMIC(TESTBED) - REGISTER_PLUGIN_DYNAMIC(TESTBED, PLUGIN_TYPE_ENGINE, TestbedMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TESTBED, PLUGIN_TYPE_ENGINE, TestbedMetaEngine); #else - REGISTER_PLUGIN_STATIC(TESTBED, PLUGIN_TYPE_ENGINE, TestbedMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TESTBED, PLUGIN_TYPE_ENGINE, TestbedMetaEngine); #endif diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index e39e82c8c8a..13eed4bb39b 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -36,9 +36,9 @@ static const PlainGameDescriptor tinselGames[] = { #include "tinsel/detection_tables.h" -class TinselMetaEngine : public AdvancedMetaEngine { +class TinselMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TinselMetaEngine() : AdvancedMetaEngine(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { + TinselMetaEngineStatic() : AdvancedMetaEngineStatic(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) { } const char *getEngineId() const override{ @@ -68,7 +68,7 @@ typedef Common::Array ADGameDescList; * Fallback detection scans the list of Discworld 2 targets to see if it can detect an installation * where the files haven't been renamed (i.e. don't have the '1' just before the extension) */ -ADDetectedGame TinselMetaEngine::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const { +ADDetectedGame TinselMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const { Common::String extra; FileMap allFiles; SizeMD5Map filesSizeMD5; @@ -204,4 +204,4 @@ ADDetectedGame TinselMetaEngine::fallbackDetect(const FileMap &allFilesXXX, cons return matched; } -REGISTER_PLUGIN_STATIC(TINSEL_DETECTION, PLUGIN_TYPE_METAENGINE, TinselMetaEngine); +REGISTER_PLUGIN_STATIC(TINSEL_DETECTION, PLUGIN_TYPE_METAENGINE, TinselMetaEngineStatic); diff --git a/engines/tinsel/metaengine.cpp b/engines/tinsel/metaengine.cpp index a5a5eb3c67b..91a33d7a9f7 100644 --- a/engines/tinsel/metaengine.cpp +++ b/engines/tinsel/metaengine.cpp @@ -63,7 +63,7 @@ bool TinselEngine::isV1CD() const { } // End of namespace Tinsel -class TinselMetaEngineConnect : public AdvancedMetaEngineConnect { +class TinselMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override{ return "tinsel"; @@ -78,7 +78,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool TinselMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool TinselMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -105,7 +105,7 @@ bool Tinsel::TinselEngine::hasFeature(EngineFeature f) const { (f == kSupportsLoadingDuringRuntime); } -SaveStateDescriptor TinselMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor TinselMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String fileName; fileName = Common::String::format("%s.%03u", target, slot); @@ -147,7 +147,7 @@ namespace Tinsel { extern int getList(Common::SaveFileManager *saveFileMan, const Common::String &target); } -SaveStateList TinselMetaEngineConnect::listSaves(const char *target) const { +SaveStateList TinselMetaEngine::listSaves(const char *target) const { Common::String pattern = target; pattern = pattern + ".###"; Common::StringArray files = g_system->getSavefileManager()->listSavefiles(pattern); @@ -179,7 +179,7 @@ SaveStateList TinselMetaEngineConnect::listSaves(const char *target) const { return saveList; } -bool TinselMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Tinsel::TinselGameDescription *gd = (const Tinsel::TinselGameDescription *)desc; if (gd) { *engine = new Tinsel::TinselEngine(syst, gd); @@ -187,9 +187,9 @@ bool TinselMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con return gd != 0; } -int TinselMetaEngineConnect::getMaximumSaveSlot() const { return 99; } +int TinselMetaEngine::getMaximumSaveSlot() const { return 99; } -void TinselMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void TinselMetaEngine::removeSaveState(const char *target, int slot) const { Tinsel::setNeedLoad(); // Same issue here as with loadGameState(): we need the physical savegame // slot. Refer to bug #3387551. @@ -211,9 +211,9 @@ void TinselMetaEngineConnect::removeSaveState(const char *target, int slot) cons } #if PLUGIN_ENABLED_DYNAMIC(TINSEL) - REGISTER_PLUGIN_DYNAMIC(TINSEL, PLUGIN_TYPE_ENGINE, TinselMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TINSEL, PLUGIN_TYPE_ENGINE, TinselMetaEngine); #else - REGISTER_PLUGIN_STATIC(TINSEL, PLUGIN_TYPE_ENGINE, TinselMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TINSEL, PLUGIN_TYPE_ENGINE, TinselMetaEngine); #endif namespace Tinsel { diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp index c3aaf829b21..f71f76d9a43 100644 --- a/engines/titanic/detection.cpp +++ b/engines/titanic/detection.cpp @@ -34,9 +34,9 @@ static const PlainGameDescriptor TitanicGames[] = { #include "titanic/detection_tables.h" -class TitanicMetaEngine : public AdvancedMetaEngine { +class TitanicMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TitanicMetaEngine() : AdvancedMetaEngine(Titanic::gameDescriptions, sizeof(Titanic::TitanicGameDescription), TitanicGames) { + TitanicMetaEngineStatic() : AdvancedMetaEngineStatic(Titanic::gameDescriptions, sizeof(Titanic::TitanicGameDescription), TitanicGames) { _maxScanDepth = 3; } @@ -53,4 +53,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TITANIC_DETECTION, PLUGIN_TYPE_METAENGINE, TitanicMetaEngine); +REGISTER_PLUGIN_STATIC(TITANIC_DETECTION, PLUGIN_TYPE_METAENGINE, TitanicMetaEngineStatic); diff --git a/engines/titanic/metaengine.cpp b/engines/titanic/metaengine.cpp index 1883f04e2ca..13315642dfb 100644 --- a/engines/titanic/metaengine.cpp +++ b/engines/titanic/metaengine.cpp @@ -45,7 +45,7 @@ Common::Language TitanicEngine::getLanguage() const { } // End of namespace Titanic -class TitanicMetaEngineConnect : public AdvancedMetaEngineConnect { +class TitanicMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "titanic"; @@ -60,7 +60,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool TitanicMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool TitanicMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -79,14 +79,14 @@ bool Titanic::TitanicEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool TitanicMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool TitanicMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Titanic::TitanicGameDescription *gd = (const Titanic::TitanicGameDescription *)desc; *engine = new Titanic::TitanicEngine(syst, gd); return gd != 0; } -SaveStateList TitanicMetaEngineConnect::listSaves(const char *target) const { +SaveStateList TitanicMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -120,16 +120,16 @@ SaveStateList TitanicMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int TitanicMetaEngineConnect::getMaximumSaveSlot() const { +int TitanicMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void TitanicMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void TitanicMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor TitanicMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor TitanicMetaEngine::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); @@ -162,7 +162,7 @@ SaveStateDescriptor TitanicMetaEngineConnect::querySaveMetaInfos(const char *tar } #if PLUGIN_ENABLED_DYNAMIC(TITANIC) - REGISTER_PLUGIN_DYNAMIC(TITANIC, PLUGIN_TYPE_ENGINE, TitanicMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TITANIC, PLUGIN_TYPE_ENGINE, TitanicMetaEngine); #else - REGISTER_PLUGIN_STATIC(TITANIC, PLUGIN_TYPE_ENGINE, TitanicMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TITANIC, PLUGIN_TYPE_ENGINE, TitanicMetaEngine); #endif diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp index 201d6aba022..a4b7e1d3ae3 100644 --- a/engines/toltecs/detection.cpp +++ b/engines/toltecs/detection.cpp @@ -216,9 +216,9 @@ static const ExtraGuiOption toltecsExtraGuiOption = { false }; -class ToltecsMetaEngine : public AdvancedMetaEngine { +class ToltecsMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ToltecsMetaEngine() : AdvancedMetaEngine(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) { + ToltecsMetaEngineStatic() : AdvancedMetaEngineStatic(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) { } const char *getEngineId() const override { @@ -236,10 +236,10 @@ public: const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override; }; -const ExtraGuiOptions ToltecsMetaEngine::getExtraGuiOptions(const Common::String &target) const { +const ExtraGuiOptions ToltecsMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; options.push_back(toltecsExtraGuiOption); return options; } -REGISTER_PLUGIN_STATIC(TOLTECS_DETECTION, PLUGIN_TYPE_METAENGINE, ToltecsMetaEngine); +REGISTER_PLUGIN_STATIC(TOLTECS_DETECTION, PLUGIN_TYPE_METAENGINE, ToltecsMetaEngineStatic); diff --git a/engines/toltecs/metaengine.cpp b/engines/toltecs/metaengine.cpp index e3dda22ed2e..d47df0d1295 100644 --- a/engines/toltecs/metaengine.cpp +++ b/engines/toltecs/metaengine.cpp @@ -44,7 +44,7 @@ Common::Language ToltecsEngine::getLanguage() const { } // End of namespace Toltecs -class ToltecsMetaEngineConnect : public AdvancedMetaEngineConnect { +class ToltecsMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "toltecs"; @@ -59,7 +59,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool ToltecsMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ToltecsMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -78,7 +78,7 @@ bool Toltecs::ToltecsEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool ToltecsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ToltecsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Toltecs::ToltecsGameDescription *gd = (const Toltecs::ToltecsGameDescription *)desc; if (gd) { *engine = new Toltecs::ToltecsEngine(syst, gd); @@ -86,7 +86,7 @@ bool ToltecsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, co return gd != 0; } -SaveStateList ToltecsMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ToltecsMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Toltecs::ToltecsEngine::SaveHeader header; Common::String pattern = target; @@ -116,11 +116,11 @@ SaveStateList ToltecsMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int ToltecsMetaEngineConnect::getMaximumSaveSlot() const { +int ToltecsMetaEngine::getMaximumSaveSlot() const { return 999; } -void ToltecsMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ToltecsMetaEngine::removeSaveState(const char *target, int slot) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::String filename = Toltecs::ToltecsEngine::getSavegameFilename(target, slot); @@ -144,7 +144,7 @@ void ToltecsMetaEngineConnect::removeSaveState(const char *target, int slot) con } } -SaveStateDescriptor ToltecsMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Toltecs::ToltecsEngine::getSavegameFilename(target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); @@ -183,8 +183,8 @@ SaveStateDescriptor ToltecsMetaEngineConnect::querySaveMetaInfos(const char *tar } #if PLUGIN_ENABLED_DYNAMIC(TOLTECS) - REGISTER_PLUGIN_DYNAMIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngine); #else - REGISTER_PLUGIN_STATIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngine); #endif diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp index d02ddea22c8..9708f1564f9 100644 --- a/engines/tony/detection.cpp +++ b/engines/tony/detection.cpp @@ -33,9 +33,9 @@ static const PlainGameDescriptor tonyGames[] = { #include "tony/detection_tables.h" -class TonyMetaEngine : public AdvancedMetaEngine { +class TonyMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TonyMetaEngine() : AdvancedMetaEngine(Tony::gameDescriptions, sizeof(Tony::TonyGameDescription), tonyGames) { + TonyMetaEngineStatic() : AdvancedMetaEngineStatic(Tony::gameDescriptions, sizeof(Tony::TonyGameDescription), tonyGames) { } const char *getEngineId() const override { @@ -51,4 +51,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TONY_DETECTION, PLUGIN_TYPE_METAENGINE, TonyMetaEngine); +REGISTER_PLUGIN_STATIC(TONY_DETECTION, PLUGIN_TYPE_METAENGINE, TonyMetaEngineStatic); diff --git a/engines/tony/metaengine.cpp b/engines/tony/metaengine.cpp index 8c2f6949de2..dd2a019b2bd 100644 --- a/engines/tony/metaengine.cpp +++ b/engines/tony/metaengine.cpp @@ -51,7 +51,7 @@ bool TonyEngine::isCompressed() const { } // End of namespace Tony -class TonyMetaEngineConnect : public AdvancedMetaEngineConnect { +class TonyMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "tony"; @@ -66,7 +66,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool TonyMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool TonyMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -82,7 +82,7 @@ bool Tony::TonyEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool TonyMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool TonyMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Tony::TonyGameDescription *gd = (const Tony::TonyGameDescription *)desc; if (gd) { *engine = new Tony::TonyEngine(syst, gd); @@ -90,7 +90,7 @@ bool TonyMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return gd != 0; } -SaveStateList TonyMetaEngineConnect::listSaves(const char *target) const { +SaveStateList TonyMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -120,17 +120,17 @@ SaveStateList TonyMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int TonyMetaEngineConnect::getMaximumSaveSlot() const { +int TonyMetaEngine::getMaximumSaveSlot() const { return 99; } -void TonyMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void TonyMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Tony::TonyEngine::getSaveStateFileName(slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor TonyMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor TonyMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String saveName; byte difficulty; @@ -157,7 +157,7 @@ SaveStateDescriptor TonyMetaEngineConnect::querySaveMetaInfos(const char *target } #if PLUGIN_ENABLED_DYNAMIC(TONY) - REGISTER_PLUGIN_DYNAMIC(TONY, PLUGIN_TYPE_ENGINE, TonyMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TONY, PLUGIN_TYPE_ENGINE, TonyMetaEngine); #else - REGISTER_PLUGIN_STATIC(TONY, PLUGIN_TYPE_ENGINE, TonyMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TONY, PLUGIN_TYPE_ENGINE, TonyMetaEngine); #endif diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index be3974cfdb5..3636fde323c 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -130,9 +130,9 @@ static const char * const directoryGlobs[] = { 0 }; -class ToonMetaEngine : public AdvancedMetaEngine { +class ToonMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ToonMetaEngine() : AdvancedMetaEngine(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { + ToonMetaEngineStatic() : AdvancedMetaEngineStatic(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) { _maxScanDepth = 3; _directoryGlobs = directoryGlobs; } @@ -154,4 +154,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TOON_DETECTION, PLUGIN_TYPE_METAENGINE, ToonMetaEngine); +REGISTER_PLUGIN_STATIC(TOON_DETECTION, PLUGIN_TYPE_METAENGINE, ToonMetaEngineStatic); diff --git a/engines/toon/metaengine.cpp b/engines/toon/metaengine.cpp index f75bad337e6..138484f5abb 100644 --- a/engines/toon/metaengine.cpp +++ b/engines/toon/metaengine.cpp @@ -28,7 +28,7 @@ #include "graphics/thumbnail.h" #include "toon/toon.h" -class ToonMetaEngineConnect : public AdvancedMetaEngineConnect { +class ToonMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "toon"; @@ -43,7 +43,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool ToonMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ToonMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -55,14 +55,14 @@ bool ToonMetaEngineConnect::hasFeature(MetaEngineFeature f) const { (f == kSimpleSavesNames); } -void ToonMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ToonMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(fileName); } -int ToonMetaEngineConnect::getMaximumSaveSlot() const { return MAX_SAVE_SLOT; } +int ToonMetaEngine::getMaximumSaveSlot() const { return MAX_SAVE_SLOT; } -SaveStateList ToonMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ToonMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; @@ -105,7 +105,7 @@ SaveStateList ToonMetaEngineConnect::listSaves(const char *target) const { return saveList; } -SaveStateDescriptor ToonMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +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); @@ -157,7 +157,7 @@ SaveStateDescriptor ToonMetaEngineConnect::querySaveMetaInfos(const char *target return SaveStateDescriptor(); } -bool ToonMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ToonMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Toon::ToonEngine(syst, desc); } @@ -165,7 +165,7 @@ bool ToonMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const } #if PLUGIN_ENABLED_DYNAMIC(TOON) - REGISTER_PLUGIN_DYNAMIC(TOON, PLUGIN_TYPE_ENGINE, ToonMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TOON, PLUGIN_TYPE_ENGINE, ToonMetaEngine); #else - REGISTER_PLUGIN_STATIC(TOON, PLUGIN_TYPE_ENGINE, ToonMetaEngineConnect); -#endif \ No newline at end of file + REGISTER_PLUGIN_STATIC(TOON, PLUGIN_TYPE_ENGINE, ToonMetaEngine); +#endif diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp index 33605d33ee0..98de9aa8ad9 100644 --- a/engines/touche/detection.cpp +++ b/engines/touche/detection.cpp @@ -119,9 +119,9 @@ static const char *directoryGlobs[] = { 0 }; -class ToucheMetaEngine : public AdvancedMetaEngine { +class ToucheMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ToucheMetaEngine() : AdvancedMetaEngine(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { + ToucheMetaEngineStatic() : AdvancedMetaEngineStatic(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) { _md5Bytes = 4096; _maxScanDepth = 2; _directoryGlobs = directoryGlobs; @@ -144,4 +144,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TOUCHE_DETECTION, PLUGIN_TYPE_METAENGINE, ToucheMetaEngine); +REGISTER_PLUGIN_STATIC(TOUCHE_DETECTION, PLUGIN_TYPE_METAENGINE, ToucheMetaEngineStatic); diff --git a/engines/touche/metaengine.cpp b/engines/touche/metaengine.cpp index 5d6e95e3f7c..2127a137c4f 100644 --- a/engines/touche/metaengine.cpp +++ b/engines/touche/metaengine.cpp @@ -29,7 +29,7 @@ #include "touche/touche.h" -class ToucheMetaEngineConnect : public AdvancedMetaEngineConnect { +class ToucheMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "touche"; @@ -42,7 +42,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool ToucheMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ToucheMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -57,14 +57,14 @@ bool Touche::ToucheEngine::hasFeature(EngineFeature f) const { (f == kSupportsSubtitleOptions); } -bool ToucheMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ToucheMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Touche::ToucheEngine(syst, desc->language); } return desc != 0; } -SaveStateList ToucheMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ToucheMetaEngine::listSaves(const char *target) const { Common::String pattern = Touche::generateGameStateFileName(target, 0, true); Common::StringArray filenames = g_system->getSavefileManager()->listSavefiles(pattern); bool slotsTable[Touche::kMaxSaveStates]; @@ -93,17 +93,17 @@ SaveStateList ToucheMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int ToucheMetaEngineConnect::getMaximumSaveSlot() const { +int ToucheMetaEngine::getMaximumSaveSlot() const { return Touche::kMaxSaveStates - 1; } -void ToucheMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ToucheMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Touche::generateGameStateFileName(target, slot); g_system->getSavefileManager()->removeSavefile(filename); } #if PLUGIN_ENABLED_DYNAMIC(TOUCHE) - REGISTER_PLUGIN_DYNAMIC(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngine); #else - REGISTER_PLUGIN_STATIC(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TOUCHE, PLUGIN_TYPE_ENGINE, ToucheMetaEngine); #endif diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index 5d5c5f6284a..f7ec40c90fa 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -36,9 +36,9 @@ static const PlainGameDescriptor tSageGameTitles[] = { #include "tsage/detection_tables.h" -class TSageMetaEngine : public AdvancedMetaEngine { +class TSageMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TSageMetaEngine() : AdvancedMetaEngine(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { + TSageMetaEngineStatic() : AdvancedMetaEngineStatic(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) { } const char *getEngineId() const override { @@ -54,4 +54,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(TSAGE_DETECTION, PLUGIN_TYPE_METAENGINE, TSageMetaEngine); +REGISTER_PLUGIN_STATIC(TSAGE_DETECTION, PLUGIN_TYPE_METAENGINE, TSageMetaEngineStatic); diff --git a/engines/tsage/metaengine.cpp b/engines/tsage/metaengine.cpp index a3dd011fa1f..9e2edc2b904 100644 --- a/engines/tsage/metaengine.cpp +++ b/engines/tsage/metaengine.cpp @@ -55,7 +55,7 @@ enum { MAX_SAVES = 100 }; -class TSageMetaEngineConnect : public AdvancedMetaEngineConnect { +class TSageMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "tsage"; @@ -156,7 +156,7 @@ public: }; #if PLUGIN_ENABLED_DYNAMIC(TSAGE) - REGISTER_PLUGIN_DYNAMIC(TSAGE, PLUGIN_TYPE_ENGINE, TSageMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TSAGE, PLUGIN_TYPE_ENGINE, TSageMetaEngine); #else - REGISTER_PLUGIN_STATIC(TSAGE, PLUGIN_TYPE_ENGINE, TSageMetaEngineConnect); -#endif \ No newline at end of file + REGISTER_PLUGIN_STATIC(TSAGE, PLUGIN_TYPE_ENGINE, TSageMetaEngine); +#endif diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp index ebacb19e418..e0cbc9a5d3a 100644 --- a/engines/tucker/detection.cpp +++ b/engines/tucker/detection.cpp @@ -116,9 +116,9 @@ static const ADGameDescription tuckerDemoGameDescription = { GUIO1(GUIO_NOMIDI) }; -class TuckerMetaEngine : public AdvancedMetaEngine { +class TuckerMetaEngineStatic : public AdvancedMetaEngineStatic { public: - TuckerMetaEngine() : AdvancedMetaEngine(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { + TuckerMetaEngineStatic() : AdvancedMetaEngineStatic(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) { _md5Bytes = 512; } @@ -151,4 +151,4 @@ public: }; -REGISTER_PLUGIN_STATIC(TUCKER_DETECTION, PLUGIN_TYPE_METAENGINE, TuckerMetaEngine); +REGISTER_PLUGIN_STATIC(TUCKER_DETECTION, PLUGIN_TYPE_METAENGINE, TuckerMetaEngineStatic); diff --git a/engines/tucker/metaengine.cpp b/engines/tucker/metaengine.cpp index 222dad100c8..068cb4a5be6 100644 --- a/engines/tucker/metaengine.cpp +++ b/engines/tucker/metaengine.cpp @@ -29,7 +29,7 @@ #include "tucker/tucker.h" -class TuckerMetaEngineConnect : public AdvancedMetaEngineConnect { +class TuckerMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "tucker"; @@ -150,7 +150,7 @@ public: }; #if PLUGIN_ENABLED_DYNAMIC(TUCKER) - REGISTER_PLUGIN_DYNAMIC(TUCKER, PLUGIN_TYPE_ENGINE, TuckerMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(TUCKER, PLUGIN_TYPE_ENGINE, TuckerMetaEngine); #else - REGISTER_PLUGIN_STATIC(TUCKER, PLUGIN_TYPE_ENGINE, TuckerMetaEngineConnect); + REGISTER_PLUGIN_STATIC(TUCKER, PLUGIN_TYPE_ENGINE, TuckerMetaEngine); #endif diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp index 8f62f6fe467..3ee021a9951 100644 --- a/engines/ultima/detection.cpp +++ b/engines/ultima/detection.cpp @@ -49,11 +49,11 @@ static const PlainGameDescriptor ULTIMA_GAMES[] = { #include "ultima/detection_tables.h" -UltimaMetaEngine::UltimaMetaEngine() : AdvancedMetaEngine(Ultima::GAME_DESCRIPTIONS, +UltimaMetaEngineStatic::UltimaMetaEngineStatic() : AdvancedMetaEngineStatic(Ultima::GAME_DESCRIPTIONS, sizeof(Ultima::UltimaGameDescription), Ultima::ULTIMA_GAMES) { static const char *const DIRECTORY_GLOBS[2] = { "usecode", 0 }; _maxScanDepth = 2; _directoryGlobs = DIRECTORY_GLOBS; } -REGISTER_PLUGIN_STATIC(ULTIMA_DETECTION, PLUGIN_TYPE_METAENGINE, UltimaMetaEngine); +REGISTER_PLUGIN_STATIC(ULTIMA_DETECTION, PLUGIN_TYPE_METAENGINE, UltimaMetaEngineStatic); diff --git a/engines/ultima/detection.h b/engines/ultima/detection.h index 388d2fb5b2e..52b2eff3e3e 100644 --- a/engines/ultima/detection.h +++ b/engines/ultima/detection.h @@ -58,10 +58,10 @@ struct UltimaGameDescription { } // End of namespace Ultima -class UltimaMetaEngine : public AdvancedMetaEngine { +class UltimaMetaEngineStatic : public AdvancedMetaEngineStatic { public: - UltimaMetaEngine(); - ~UltimaMetaEngine() override {} + UltimaMetaEngineStatic(); + ~UltimaMetaEngineStatic() override {} const char *getEngineId() const override { return "ultima"; diff --git a/engines/ultima/metaengine.cpp b/engines/ultima/metaengine.cpp index 84aae06901f..3ea84c1487e 100644 --- a/engines/ultima/metaengine.cpp +++ b/engines/ultima/metaengine.cpp @@ -37,11 +37,11 @@ #include "ultima/metaengine.h" -const char *UltimaMetaEngineConnect::getName() const { +const char *UltimaMetaEngine::getName() const { return "ultima"; } -bool UltimaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool UltimaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Ultima::UltimaGameDescription *gd = (const Ultima::UltimaGameDescription *)desc; if (gd) { switch (gd->gameId) { @@ -71,12 +71,12 @@ bool UltimaMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con return gd != 0; } -int UltimaMetaEngineConnect::getMaximumSaveSlot() const { +int UltimaMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -SaveStateList UltimaMetaEngineConnect::listSaves(const char *target) const { - SaveStateList saveList = AdvancedMetaEngineConnect::listSaves(target); +SaveStateList UltimaMetaEngine::listSaves(const char *target) const { + SaveStateList saveList = AdvancedMetaEngine::listSaves(target); Common::String gameId = getGameId(target); if (gameId == "ultima6" || gameId == "ultima6_enh") @@ -85,7 +85,7 @@ SaveStateList UltimaMetaEngineConnect::listSaves(const char *target) const { return saveList; } -Common::KeymapArray UltimaMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray UltimaMetaEngine::initKeymaps(const char *target) const { const Common::String gameId = getGameId(target); if (gameId == "ultima4" || gameId == "ultima4_enh") return Ultima::Ultima4::MetaEngine::initKeymaps(); @@ -95,7 +95,7 @@ Common::KeymapArray UltimaMetaEngineConnect::initKeymaps(const char *target) con return Common::KeymapArray(); } -Common::String UltimaMetaEngineConnect::getGameId(const char *target) { +Common::String UltimaMetaEngine::getGameId(const char *target) { // Store a copy of the active domain Common::String currDomain = ConfMan.getActiveDomainName(); @@ -109,7 +109,7 @@ Common::String UltimaMetaEngineConnect::getGameId(const char *target) { } #if PLUGIN_ENABLED_DYNAMIC(ULTIMA) - REGISTER_PLUGIN_DYNAMIC(ULTIMA, PLUGIN_TYPE_ENGINE, UltimaMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(ULTIMA, PLUGIN_TYPE_ENGINE, UltimaMetaEngine); #else - REGISTER_PLUGIN_STATIC(ULTIMA, PLUGIN_TYPE_ENGINE, UltimaMetaEngineConnect); + REGISTER_PLUGIN_STATIC(ULTIMA, PLUGIN_TYPE_ENGINE, UltimaMetaEngine); #endif diff --git a/engines/ultima/metaengine.h b/engines/ultima/metaengine.h index 0dc07561414..3297d0a7388 100644 --- a/engines/ultima/metaengine.h +++ b/engines/ultima/metaengine.h @@ -28,7 +28,7 @@ #define MAX_SAVES 99 -class UltimaMetaEngineConnect : public AdvancedMetaEngineConnect { +class UltimaMetaEngine : public AdvancedMetaEngine { private: /** * Gets the game Id given a target string diff --git a/engines/ultima/nuvie/files/nuvie_io_file.cpp b/engines/ultima/nuvie/files/nuvie_io_file.cpp index b8f0fa13572..5acfe4fa5b7 100644 --- a/engines/ultima/nuvie/files/nuvie_io_file.cpp +++ b/engines/ultima/nuvie/files/nuvie_io_file.cpp @@ -164,7 +164,7 @@ void NuvieIOFileWrite::close() { } else if (_saveFile) { // Writing using savefile interface, so flush out data _saveFile->write(_saveFileData.getData(), _saveFileData.size()); - MetaEngineConnect::appendExtendedSave(_saveFile, Shared::g_ultima->getTotalPlayTime(), _description, _isAutosave); + MetaEngine::appendExtendedSave(_saveFile, Shared::g_ultima->getTotalPlayTime(), _description, _isAutosave); _saveFile->finalize(); delete _saveFile; diff --git a/engines/ultima/ultima8/filesys/savegame.cpp b/engines/ultima/ultima8/filesys/savegame.cpp index 8e5a5e1dd2a..58e506e2660 100644 --- a/engines/ultima/ultima8/filesys/savegame.cpp +++ b/engines/ultima/ultima8/filesys/savegame.cpp @@ -36,7 +36,7 @@ namespace Ultima8 { #define SAVEGAME_VERSION 5 SavegameReader::SavegameReader(Common::SeekableReadStream *rs, bool metadataOnly) : _file(rs), _version(0) { - if (!MetaEngineConnect::readSavegameHeader(rs, &_header)) + if (!MetaEngine::readSavegameHeader(rs, &_header)) return; // Validate the identifier for a valid savegame diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp index 1afa7bec504..8c93164d042 100644 --- a/engines/voyeur/detection.cpp +++ b/engines/voyeur/detection.cpp @@ -34,9 +34,9 @@ static const PlainGameDescriptor voyeurGames[] = { #include "voyeur/detection_tables.h" -class VoyeurMetaEngine : public AdvancedMetaEngine { +class VoyeurMetaEngineStatic : public AdvancedMetaEngineStatic { public: - VoyeurMetaEngine() : AdvancedMetaEngine(Voyeur::gameDescriptions, sizeof(Voyeur::VoyeurGameDescription), voyeurGames) { + VoyeurMetaEngineStatic() : AdvancedMetaEngineStatic(Voyeur::gameDescriptions, sizeof(Voyeur::VoyeurGameDescription), voyeurGames) { _maxScanDepth = 3; } @@ -53,4 +53,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(VOYEUR_DETECTION, PLUGIN_TYPE_METAENGINE, VoyeurMetaEngine); +REGISTER_PLUGIN_STATIC(VOYEUR_DETECTION, PLUGIN_TYPE_METAENGINE, VoyeurMetaEngineStatic); diff --git a/engines/voyeur/metaengine.cpp b/engines/voyeur/metaengine.cpp index ee145ef19fd..c59ad1ff3f9 100644 --- a/engines/voyeur/metaengine.cpp +++ b/engines/voyeur/metaengine.cpp @@ -53,7 +53,7 @@ bool VoyeurEngine::getIsDemo() const { } // End of namespace Voyeur -class VoyeurMetaEngineConnect : public AdvancedMetaEngineConnect { +class VoyeurMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "voyeur"; @@ -67,7 +67,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool VoyeurMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool VoyeurMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -84,7 +84,7 @@ bool Voyeur::VoyeurEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool VoyeurMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool VoyeurMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Voyeur::VoyeurGameDescription *gd = (const Voyeur::VoyeurGameDescription *)desc; if (gd) { *engine = new Voyeur::VoyeurEngine(syst, gd); @@ -92,7 +92,7 @@ bool VoyeurMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, con return gd != 0; } -SaveStateList VoyeurMetaEngineConnect::listSaves(const char *target) const { +SaveStateList VoyeurMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -124,16 +124,16 @@ SaveStateList VoyeurMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int VoyeurMetaEngineConnect::getMaximumSaveSlot() const { +int VoyeurMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void VoyeurMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void VoyeurMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor VoyeurMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor VoyeurMetaEngine::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); @@ -156,7 +156,7 @@ SaveStateDescriptor VoyeurMetaEngineConnect::querySaveMetaInfos(const char *targ } #if PLUGIN_ENABLED_DYNAMIC(VOYEUR) - REGISTER_PLUGIN_DYNAMIC(VOYEUR, PLUGIN_TYPE_ENGINE, VoyeurMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(VOYEUR, PLUGIN_TYPE_ENGINE, VoyeurMetaEngine); #else - REGISTER_PLUGIN_STATIC(VOYEUR, PLUGIN_TYPE_ENGINE, VoyeurMetaEngineConnect); + REGISTER_PLUGIN_STATIC(VOYEUR, PLUGIN_TYPE_ENGINE, VoyeurMetaEngine); #endif diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp index 6a1b2437457..7432e4d4fd7 100644 --- a/engines/wage/detection.cpp +++ b/engines/wage/detection.cpp @@ -39,9 +39,9 @@ static const PlainGameDescriptor wageGames[] = { #include "wage/detection_tables.h" -class WageMetaEngine : public AdvancedMetaEngine { +class WageMetaEngineStatic : public AdvancedMetaEngineStatic { public: - WageMetaEngine() : AdvancedMetaEngine(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) { + WageMetaEngineStatic() : AdvancedMetaEngineStatic(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) { _md5Bytes = 2 * 1024 * 1024; _guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI); } @@ -59,4 +59,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(WAGE_DETECTION, PLUGIN_TYPE_METAENGINE, WageMetaEngine); +REGISTER_PLUGIN_STATIC(WAGE_DETECTION, PLUGIN_TYPE_METAENGINE, WageMetaEngineStatic); diff --git a/engines/wage/metaengine.cpp b/engines/wage/metaengine.cpp index 234ec45dcfc..f9627d04201 100644 --- a/engines/wage/metaengine.cpp +++ b/engines/wage/metaengine.cpp @@ -37,7 +37,7 @@ const char *WageEngine::getGameFile() const { } // End of namespace Wage -class WageMetaEngineConnect : public AdvancedMetaEngineConnect { +class WageMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "wage"; @@ -51,7 +51,7 @@ public: void removeSaveState(const char *target, int slot) const override; }; -bool WageMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool WageMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -66,14 +66,14 @@ bool Wage::WageEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool WageMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool WageMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { if (desc) { *engine = new Wage::WageEngine(syst, desc); } return desc != 0; } -SaveStateList WageMetaEngineConnect::listSaves(const char *target) const { +SaveStateList WageMetaEngine::listSaves(const char *target) const { const uint32 WAGEflag = MKTAG('W','A','G','E'); Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; @@ -114,16 +114,16 @@ SaveStateList WageMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int WageMetaEngineConnect::getMaximumSaveSlot() const { return 999; } +int WageMetaEngine::getMaximumSaveSlot() const { return 999; } -void WageMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void WageMetaEngine::removeSaveState(const char *target, int slot) const { g_system->getSavefileManager()->removeSavefile(Common::String::format("%s.%03d", target, slot)); } #if PLUGIN_ENABLED_DYNAMIC(WAGE) - REGISTER_PLUGIN_DYNAMIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngine); #else - REGISTER_PLUGIN_STATIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngineConnect); + REGISTER_PLUGIN_STATIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngine); #endif namespace Wage { diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index 525342dfa66..e6f304509b4 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -66,9 +66,9 @@ static const char *directoryGlobs[] = { 0 }; -class WintermuteMetaEngine : public AdvancedMetaEngine { +class WintermuteMetaEngineStatic : public AdvancedMetaEngineStatic { public: - WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) { + WintermuteMetaEngineStatic() : AdvancedMetaEngineStatic(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) { // Use kADFlagUseExtraAsHint to distinguish between SD and HD versions // of J.U.L.I.A. when their datafiles sit in the same directory (e.g. in Steam distribution). _flags = kADFlagUseExtraAsHint; @@ -99,7 +99,7 @@ public: if (metaEnginePlugin) { const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin); if (enginePlugin) { - return enginePlugin->get().fallbackDetectExtern(_md5Bytes, allFiles, fslist); + return enginePlugin->get().fallbackDetectExtern(_md5Bytes, allFiles, fslist); } else { static bool warn = true; if (warn) { @@ -115,4 +115,4 @@ public: } // End of namespace Wintermute -REGISTER_PLUGIN_STATIC(WINTERMUTE_DETECTION, PLUGIN_TYPE_METAENGINE, Wintermute::WintermuteMetaEngine); +REGISTER_PLUGIN_STATIC(WINTERMUTE_DETECTION, PLUGIN_TYPE_METAENGINE, Wintermute::WintermuteMetaEngineStatic); diff --git a/engines/wintermute/ext/wme_galaxy.cpp b/engines/wintermute/ext/wme_galaxy.cpp index cd70a484c51..0c90e528385 100644 --- a/engines/wintermute/ext/wme_galaxy.cpp +++ b/engines/wintermute/ext/wme_galaxy.cpp @@ -50,7 +50,7 @@ SXWMEGalaxyAPI::SXWMEGalaxyAPI(BaseGame *inGame, ScStack *stack) : BaseScriptabl ////////////////////////////////////////////////////////////////////////// void SXWMEGalaxyAPI::init() { - const MetaEngineConnect &meta = ((WintermuteEngine *)g_engine)->getMetaEngineConnect(); + const MetaEngine &meta = ((WintermuteEngine *)g_engine)->getMetaEngineConnect(); const Common::String target = BaseEngine::instance().getGameTargetName(); _achievementsInfo = meta.getAchievementsInfo(target); diff --git a/engines/wintermute/ext/wme_steam.cpp b/engines/wintermute/ext/wme_steam.cpp index 62bc171869c..7e5b0647db1 100644 --- a/engines/wintermute/ext/wme_steam.cpp +++ b/engines/wintermute/ext/wme_steam.cpp @@ -50,7 +50,7 @@ SXSteamAPI::SXSteamAPI(BaseGame *inGame, ScStack *stack) : BaseScriptable(inGame ////////////////////////////////////////////////////////////////////////// void SXSteamAPI::init() { - const MetaEngineConnect &meta = ((WintermuteEngine *)g_engine)->getMetaEngineConnect(); + const MetaEngine &meta = ((WintermuteEngine *)g_engine)->getMetaEngineConnect(); const Common::String target = BaseEngine::instance().getGameTargetName(); _achievementsInfo = meta.getAchievementsInfo(target); diff --git a/engines/wintermute/metaengine.cpp b/engines/wintermute/metaengine.cpp index 7c92d3b10bb..533d4b88f91 100644 --- a/engines/wintermute/metaengine.cpp +++ b/engines/wintermute/metaengine.cpp @@ -51,7 +51,7 @@ static ADGameDescription s_fallbackDesc = { static char s_fallbackExtraBuf[256]; -class WintermuteMetaEngineConnect : public AdvancedMetaEngineConnect { +class WintermuteMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "wintermute"; @@ -67,17 +67,17 @@ public: bool hasFeature(MetaEngineFeature f) const override { switch (f) { - case MetaEngineConnect::kSupportsListSaves: + case MetaEngine::kSupportsListSaves: return true; - case MetaEngineConnect::kSupportsLoadingDuringStartup: + case MetaEngine::kSupportsLoadingDuringStartup: return true; - case MetaEngineConnect::kSupportsDeleteSave: + case MetaEngine::kSupportsDeleteSave: return true; - case MetaEngineConnect::kSavesSupportCreationDate: + case MetaEngine::kSavesSupportCreationDate: return true; - case MetaEngineConnect::kSavesSupportMetaInfo: + case MetaEngine::kSavesSupportMetaInfo: return true; - case MetaEngineConnect::kSavesSupportThumbnail: + case MetaEngine::kSavesSupportThumbnail: return true; default: return false; @@ -190,7 +190,7 @@ public: if (!file->getName().hasSuffixIgnoreCase(".dcp")) continue; FileProperties tmp; - if (AdvancedMetaEngineConnect::getFilePropertiesExtern(md5Bytes, allFiles, s_fallbackDesc, file->getName(), tmp)) { + if (AdvancedMetaEngine::getFilePropertiesExtern(md5Bytes, allFiles, s_fallbackDesc, file->getName(), tmp)) { game.hasUnknownFiles = true; game.matchedFiles[file->getName()] = tmp; } @@ -203,7 +203,7 @@ public: } // End of namespace Wintermute #if PLUGIN_ENABLED_DYNAMIC(WINTERMUTE) - REGISTER_PLUGIN_DYNAMIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, Wintermute::WintermuteMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, Wintermute::WintermuteMetaEngine); #else - REGISTER_PLUGIN_STATIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, Wintermute::WintermuteMetaEngineConnect); + REGISTER_PLUGIN_STATIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, Wintermute::WintermuteMetaEngine); #endif diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp index 9a17c5b971a..816788ce7b5 100644 --- a/engines/xeen/detection.cpp +++ b/engines/xeen/detection.cpp @@ -64,9 +64,9 @@ static const ADExtraGuiOptionsMap optionsList[] = { AD_EXTRA_GUI_OPTIONS_TERMINATOR }; -class XeenMetaEngine : public AdvancedMetaEngine { +class XeenMetaEngineStatic : public AdvancedMetaEngineStatic { public: - XeenMetaEngine() : AdvancedMetaEngine(Xeen::gameDescriptions, sizeof(Xeen::XeenGameDescription), + XeenMetaEngineStatic() : AdvancedMetaEngineStatic(Xeen::gameDescriptions, sizeof(Xeen::XeenGameDescription), XeenGames, optionsList) { _maxScanDepth = 3; } @@ -84,4 +84,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(XEEN_DETECTION, PLUGIN_TYPE_METAENGINE, XeenMetaEngine); +REGISTER_PLUGIN_STATIC(XEEN_DETECTION, PLUGIN_TYPE_METAENGINE, XeenMetaEngineStatic); diff --git a/engines/xeen/metaengine.cpp b/engines/xeen/metaengine.cpp index bbeca613908..44119b3bf4c 100644 --- a/engines/xeen/metaengine.cpp +++ b/engines/xeen/metaengine.cpp @@ -69,7 +69,7 @@ bool XeenEngine::getIsCD() const { } // End of namespace Xeen -class XeenMetaEngineConnect : public AdvancedMetaEngineConnect { +class XeenMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "xeen"; @@ -83,7 +83,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool XeenMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool XeenMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -102,7 +102,7 @@ bool Xeen::XeenEngine::hasFeature(EngineFeature f) const { (f == kSupportsSavingDuringRuntime); } -bool XeenMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool XeenMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const Xeen::XeenGameDescription *gd = (const Xeen::XeenGameDescription *)desc; switch (gd->gameID) { @@ -121,7 +121,7 @@ bool XeenMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const return true; } -SaveStateList XeenMetaEngineConnect::listSaves(const char *target) const { +SaveStateList XeenMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String saveDesc; @@ -151,16 +151,16 @@ SaveStateList XeenMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int XeenMetaEngineConnect::getMaximumSaveSlot() const { +int XeenMetaEngine::getMaximumSaveSlot() const { return MAX_SAVES; } -void XeenMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void XeenMetaEngine::removeSaveState(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03d", target, slot); g_system->getSavefileManager()->removeSavefile(filename); } -SaveStateDescriptor XeenMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor XeenMetaEngine::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); @@ -187,7 +187,7 @@ SaveStateDescriptor XeenMetaEngineConnect::querySaveMetaInfos(const char *target } #if PLUGIN_ENABLED_DYNAMIC(XEEN) - REGISTER_PLUGIN_DYNAMIC(XEEN, PLUGIN_TYPE_ENGINE, XeenMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(XEEN, PLUGIN_TYPE_ENGINE, XeenMetaEngine); #else - REGISTER_PLUGIN_STATIC(XEEN, PLUGIN_TYPE_ENGINE, XeenMetaEngineConnect); + REGISTER_PLUGIN_STATIC(XEEN, PLUGIN_TYPE_ENGINE, XeenMetaEngine); #endif diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp index c70f8d546d1..52c149b9556 100644 --- a/engines/zvision/detection.cpp +++ b/engines/zvision/detection.cpp @@ -32,9 +32,9 @@ #include "zvision/detection.h" #include "zvision/detection_tables.h" -class ZVisionMetaEngine : public AdvancedMetaEngine { +class ZVisionMetaEngineStatic : public AdvancedMetaEngineStatic { public: - ZVisionMetaEngine() : AdvancedMetaEngine(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) { + ZVisionMetaEngineStatic() : AdvancedMetaEngineStatic(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) { _maxScanDepth = 2; _directoryGlobs = ZVision::directoryGlobs; } @@ -52,4 +52,4 @@ public: } }; -REGISTER_PLUGIN_STATIC(ZVISION_DETECTION, PLUGIN_TYPE_METAENGINE, ZVisionMetaEngine); +REGISTER_PLUGIN_STATIC(ZVISION_DETECTION, PLUGIN_TYPE_METAENGINE, ZVisionMetaEngineStatic); diff --git a/engines/zvision/metaengine.cpp b/engines/zvision/metaengine.cpp index 1732a0e5ed8..f119c53bd18 100644 --- a/engines/zvision/metaengine.cpp +++ b/engines/zvision/metaengine.cpp @@ -51,7 +51,7 @@ uint32 ZVision::getFeatures() const { } // End of namespace ZVision -class ZVisionMetaEngineConnect : public AdvancedMetaEngineConnect { +class ZVisionMetaEngine : public AdvancedMetaEngine { public: const char *getName() const override { return "zvision"; @@ -67,7 +67,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; }; -bool ZVisionMetaEngineConnect::hasFeature(MetaEngineFeature f) const { +bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const { return (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || @@ -104,7 +104,7 @@ bool ZVision::ZVision::canSaveGameStateCurrently() { return !_videoIsPlaying && currentLocation.world != 'g' && !(currentLocation.room == 'j' || currentLocation.room == 'a'); } -Common::KeymapArray ZVisionMetaEngineConnect::initKeymaps(const char *target) const { +Common::KeymapArray ZVisionMetaEngine::initKeymaps(const char *target) const { using namespace Common; using namespace ZVision; @@ -232,7 +232,7 @@ Common::KeymapArray ZVisionMetaEngineConnect::initKeymaps(const char *target) co return keymaps; } -bool ZVisionMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { +bool ZVisionMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { const ZVision::ZVisionGameDescription *gd = (const ZVision::ZVisionGameDescription *)desc; if (gd) { *engine = new ZVision::ZVision(syst, gd); @@ -240,7 +240,7 @@ bool ZVisionMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, co return gd != 0; } -SaveStateList ZVisionMetaEngineConnect::listSaves(const char *target) const { +SaveStateList ZVisionMetaEngine::listSaves(const char *target) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); ZVision::SaveGameHeader header; Common::String pattern = target; @@ -275,16 +275,16 @@ SaveStateList ZVisionMetaEngineConnect::listSaves(const char *target) const { return saveList; } -int ZVisionMetaEngineConnect::getMaximumSaveSlot() const { +int ZVisionMetaEngine::getMaximumSaveSlot() const { return 999; } -void ZVisionMetaEngineConnect::removeSaveState(const char *target, int slot) const { +void ZVisionMetaEngine::removeSaveState(const char *target, int slot) const { Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); saveFileMan->removeSavefile(Common::String::format("%s.%03u", target, slot)); } -SaveStateDescriptor ZVisionMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { +SaveStateDescriptor ZVisionMetaEngine::querySaveMetaInfos(const char *target, int slot) const { Common::String filename = Common::String::format("%s.%03u", target, slot); Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); @@ -332,7 +332,7 @@ SaveStateDescriptor ZVisionMetaEngineConnect::querySaveMetaInfos(const char *tar } #if PLUGIN_ENABLED_DYNAMIC(ZVISION) - REGISTER_PLUGIN_DYNAMIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngineConnect); + REGISTER_PLUGIN_DYNAMIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine); #else - REGISTER_PLUGIN_STATIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngineConnect); + REGISTER_PLUGIN_STATIC(ZVISION, PLUGIN_TYPE_ENGINE, ZVisionMetaEngine); #endif