[Scummvm-git-logs] scummvm master -> 7ff34bc9ec93c8e3e7867112755bacd3ca8d1dc4
sev-
sev at scummvm.org
Sun Oct 11 21:15:25 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7ea6781043 PLUGINS: PLUGIN_TYPE_METAENGINE -> PLUGIN_TYPE_ENGINE_DETECTION
7ff34bc9ec PLUGINS: MetaEngineStatic -> MetaEngineDetection
Commit: 7ea6781043235db17c1c10c5b2686e49d1430311
https://github.com/scummvm/scummvm/commit/7ea6781043235db17c1c10c5b2686e49d1430311
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-11T23:12:32+02:00
Commit Message:
PLUGINS: PLUGIN_TYPE_METAENGINE -> PLUGIN_TYPE_ENGINE_DETECTION
Changed paths:
base/main.cpp
base/plugins.cpp
base/plugins.h
engines/access/detection.cpp
engines/adl/detection.cpp
engines/agi/detection.cpp
engines/agos/detection.cpp
engines/avalanche/detection.cpp
engines/bbvs/detection.cpp
engines/bladerunner/detection.cpp
engines/cge/detection.cpp
engines/cge2/detection.cpp
engines/chewy/detection.cpp
engines/cine/detection.cpp
engines/composer/detection.cpp
engines/cruise/detection.cpp
engines/cryo/detection.cpp
engines/cryomni3d/detection.cpp
engines/director/detection.cpp
engines/dm/detection.cpp
engines/draci/detection.cpp
engines/dragons/detection.cpp
engines/drascula/detection.cpp
engines/dreamweb/detection.cpp
engines/glk/detection.cpp
engines/gnap/detection.cpp
engines/gob/detection/detection.cpp
engines/griffon/detection.cpp
engines/grim/detection.cpp
engines/groovie/detection.cpp
engines/hdb/detection.cpp
engines/hopkins/detection.cpp
engines/hugo/detection.cpp
engines/icb/detection.cpp
engines/illusions/detection.cpp
engines/kingdom/detection.cpp
engines/kyra/detection.cpp
engines/lab/detection.cpp
engines/lastexpress/detection.cpp
engines/lilliput/detection.cpp
engines/lure/detection.cpp
engines/macventure/detection.cpp
engines/made/detection.cpp
engines/mads/detection.cpp
engines/metaengine.h
engines/mohawk/detection.cpp
engines/mortevielle/detection.cpp
engines/mutationofjb/detection.cpp
engines/myst3/detection.cpp
engines/neverhood/detection.cpp
engines/ngi/detection.cpp
engines/parallaction/detection.cpp
engines/pegasus/detection.cpp
engines/petka/detection.cpp
engines/pink/detection.cpp
engines/plumbers/detection.cpp
engines/prince/detection.cpp
engines/queen/detection.cpp
engines/saga/detection.cpp
engines/sci/detection.cpp
engines/scumm/detection.cpp
engines/sherlock/detection.cpp
engines/sky/detection.cpp
engines/sludge/detection.cpp
engines/stark/detection.cpp
engines/startrek/detection.cpp
engines/supernova/detection.cpp
engines/sword1/detection.cpp
engines/sword2/detection.cpp
engines/sword25/detection.cpp
engines/teenagent/detection.cpp
engines/testbed/detection.cpp
engines/tinsel/detection.cpp
engines/titanic/detection.cpp
engines/toltecs/detection.cpp
engines/tony/detection.cpp
engines/toon/detection.cpp
engines/touche/detection.cpp
engines/tsage/detection.cpp
engines/tucker/detection.cpp
engines/ultima/detection.cpp
engines/voyeur/detection.cpp
engines/wage/detection.cpp
engines/wintermute/detection.cpp
engines/xeen/detection.cpp
engines/zvision/detection.cpp
diff --git a/base/main.cpp b/base/main.cpp
index e93951ea97..279bbe2660 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -559,7 +559,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
#if defined(UNCACHED_PLUGINS) && defined(DYNAMIC_MODULES)
// Unload all MetaEngines not needed for the current engine, if we're using uncached plugins
// to save extra memory.
- PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_METAENGINE, plugin);
+ PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE_DETECTION, plugin);
#endif
#ifdef ENABLE_EVENTRECORDER
diff --git a/base/plugins.cpp b/base/plugins.cpp
index a8d80c3d2b..ea536ca203 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -35,7 +35,7 @@
// Plugin versioning
int pluginTypeVersions[PLUGIN_TYPE_MAX] = {
- PLUGIN_TYPE_METAENGINE_VERSION,
+ PLUGIN_TYPE_ENGINE_DETECTION_VERSION,
PLUGIN_TYPE_ENGINE_VERSION,
PLUGIN_TYPE_MUSIC_VERSION,
PLUGIN_TYPE_DETECTION_VERSION,
@@ -53,7 +53,7 @@ const char *Plugin::getName() const {
}
const char *Plugin::getEngineId() const {
- if (_type == PLUGIN_TYPE_METAENGINE) {
+ if (_type == PLUGIN_TYPE_ENGINE_DETECTION) {
return _pluginObject->getEngineId();
}
@@ -272,7 +272,7 @@ void PluginManager::addPluginProvider(PluginProvider *pp) {
}
Plugin *PluginManager::getEngineFromMetaEngine(const Plugin *plugin) {
- assert(plugin->getType() == PLUGIN_TYPE_METAENGINE);
+ assert(plugin->getType() == PLUGIN_TYPE_ENGINE_DETECTION);
Plugin *enginePlugin = nullptr;
bool found = false;
@@ -310,7 +310,7 @@ Plugin *PluginManager::getMetaEngineFromEngine(const Plugin *plugin) {
Plugin *metaEngine = nullptr;
- PluginList pl = PluginMan.getPlugins(PLUGIN_TYPE_METAENGINE);
+ PluginList pl = PluginMan.getPlugins(PLUGIN_TYPE_ENGINE_DETECTION);
// This will return a name of the Engine plugin, which will be identical to
// a getEngineID from a relevant MetaEngine.
@@ -467,7 +467,7 @@ void PluginManagerUncached::loadDetectionPlugin() {
}
if (linkMetaEngines) {
- _pluginsInMem[PLUGIN_TYPE_METAENGINE].clear();
+ _pluginsInMem[PLUGIN_TYPE_ENGINE_DETECTION].clear();
const Detection &detectionConnect = _detectionPlugin->get<Detection>();
const PluginList &pl = detectionConnect.getPlugins();
Common::for_each(pl.begin(), pl.end(), Common::bind1st(Common::mem_fun(&PluginManagerUncached::tryLoadPlugin), this));
@@ -477,7 +477,7 @@ void PluginManagerUncached::loadDetectionPlugin() {
void PluginManagerUncached::unloadDetectionPlugin() {
if (_isDetectionLoaded) {
- _pluginsInMem[PLUGIN_TYPE_METAENGINE].clear();
+ _pluginsInMem[PLUGIN_TYPE_ENGINE_DETECTION].clear();
_detectionPlugin->unloadPlugin();
_isDetectionLoaded = false;
} else {
@@ -683,7 +683,7 @@ DetectionResults EngineManager::detectGames(const Common::FSList &fslist) const
// MetaEngines are always loaded into memory, so, get them and
// run detection for all of them.
- plugins = getPlugins(PLUGIN_TYPE_METAENGINE);
+ plugins = getPlugins(PLUGIN_TYPE_ENGINE_DETECTION);
// Iterate over all known games and for each check if it might be
// the game in the presented directory.
diff --git a/base/plugins.h b/base/plugins.h
index 9ae3011b52..97e9ed1194 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -60,7 +60,7 @@
#define PLUGIN_VERSION 1
enum PluginType {
- PLUGIN_TYPE_METAENGINE = 0,
+ PLUGIN_TYPE_ENGINE_DETECTION = 0,
PLUGIN_TYPE_ENGINE,
PLUGIN_TYPE_MUSIC,
PLUGIN_TYPE_DETECTION,
@@ -71,7 +71,7 @@ enum PluginType {
// TODO: Make the engine API version depend on ScummVM's version
// because of the backlinking (posibly from the checkout revision)
-#define PLUGIN_TYPE_METAENGINE_VERSION 1
+#define PLUGIN_TYPE_ENGINE_DETECTION_VERSION 1
#define PLUGIN_TYPE_ENGINE_VERSION 2
#define PLUGIN_TYPE_MUSIC_VERSION 1
#define PLUGIN_TYPE_DETECTION_VERSION 1
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index af443fbb45..982a648b30 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -52,4 +52,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(ACCESS_DETECTION, PLUGIN_TYPE_METAENGINE, AccessMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ACCESS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AccessMetaEngineStatic);
diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index 7c71801acb..a27b7ab1fa 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -474,4 +474,4 @@ ADDetectedGames AdlMetaEngineStatic::detectGame(const Common::FSNode &parent, co
} // End of namespace Adl
-REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_METAENGINE, Adl::AdlMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Adl::AdlMetaEngineStatic);
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index c72953afaf..f2a89c78b9 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -323,4 +323,4 @@ ADDetectedGame AgiMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX, c
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_METAENGINE, AgiMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AgiMetaEngineStatic);
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 9fea140ac3..a8a381b485 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -90,4 +90,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(AGOS_DETECTION, PLUGIN_TYPE_METAENGINE, AgosMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(AGOS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AgosMetaEngineStatic);
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 4c9552a0d3..14a2c64ab4 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -76,4 +76,4 @@ public:
} // End of namespace Avalanche
-REGISTER_PLUGIN_STATIC(AVALANCHE_DETECTION, PLUGIN_TYPE_METAENGINE, Avalanche::AvalancheMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(AVALANCHE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Avalanche::AvalancheMetaEngineStatic);
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index 33d28c6bfc..4245551037 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -103,4 +103,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_METAENGINE, BbvsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, BbvsMetaEngineStatic);
diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp
index 5c0bec1af2..dcb6ffafe6 100644
--- a/engines/bladerunner/detection.cpp
+++ b/engines/bladerunner/detection.cpp
@@ -120,4 +120,4 @@ const char *BladeRunnerMetaEngineStatic::getOriginalCopyright() const {
return "Blade Runner (C) 1997 Westwood Studios";
}
-REGISTER_PLUGIN_STATIC(BLADERUNNER_DETECTION, PLUGIN_TYPE_METAENGINE, BladeRunnerMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(BLADERUNNER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, BladeRunnerMetaEngineStatic);
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 1d8d433863..22668d51f3 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -177,4 +177,4 @@ ADDetectedGame CGEMetaEngineStatic::fallbackDetect(const FileMap &allFiles, cons
} // End of namespace CGE
-REGISTER_PLUGIN_STATIC(CGE_DETECTION, PLUGIN_TYPE_METAENGINE, CGE::CGEMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CGE::CGEMetaEngineStatic);
diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index ddf6ee8bfd..ffe99a2f00 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -175,4 +175,4 @@ ADDetectedGame CGE2MetaEngineStatic::fallbackDetect(const FileMap &allFiles, con
} // End of namespace CGE2
-REGISTER_PLUGIN_STATIC(CGE2_DETECTION, PLUGIN_TYPE_METAENGINE, CGE2::CGE2MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CGE2_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CGE2::CGE2MetaEngineStatic);
diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp
index c816fae9ec..2f5ac9cbef 100644
--- a/engines/chewy/detection.cpp
+++ b/engines/chewy/detection.cpp
@@ -110,4 +110,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CHEWY_DETECTION, PLUGIN_TYPE_METAENGINE, ChewyMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CHEWY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ChewyMetaEngineStatic);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 752d8c683b..c196350f41 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -78,4 +78,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CINE_DETECTION, PLUGIN_TYPE_METAENGINE, CineMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CINE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CineMetaEngineStatic);
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 087d2a29bf..a7555519c9 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -72,4 +72,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_METAENGINE, ComposerMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ComposerMetaEngineStatic);
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index dddd524fee..22027fce54 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -189,4 +189,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CRUISE_DETECTION, PLUGIN_TYPE_METAENGINE, CruiseMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CRUISE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CruiseMetaEngineStatic);
diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp
index cfff60604b..443e88e9fb 100644
--- a/engines/cryo/detection.cpp
+++ b/engines/cryo/detection.cpp
@@ -137,4 +137,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CRYO_DETECTION, PLUGIN_TYPE_METAENGINE, CryoMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CRYO_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CryoMetaEngineStatic);
diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp
index c8a50c159e..f247ac26cd 100644
--- a/engines/cryomni3d/detection.cpp
+++ b/engines/cryomni3d/detection.cpp
@@ -74,4 +74,4 @@ public:
} // End of Namespace CryOmni3D
-REGISTER_PLUGIN_STATIC(CRYOMNI3D_DETECTION, PLUGIN_TYPE_METAENGINE, CryOmni3D::CryOmni3DMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CRYOMNI3D_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CryOmni3D::CryOmni3DMetaEngineStatic);
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 81de4e99db..02eeec76a4 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -321,4 +321,4 @@ ADDetectedGame DirectorMetaEngineStatic::fallbackDetect(const FileMap &allFiles,
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(DIRECTOR_DETECTION, PLUGIN_TYPE_METAENGINE, DirectorMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DIRECTOR_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DirectorMetaEngineStatic);
diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp
index d6087b3f18..78bdb2846c 100644
--- a/engines/dm/detection.cpp
+++ b/engines/dm/detection.cpp
@@ -114,4 +114,4 @@ public:
} // End of namespace DM
-REGISTER_PLUGIN_STATIC(DM_DETECTION, PLUGIN_TYPE_METAENGINE, DM::DMMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DM::DMMetaEngineStatic);
diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index 4aad4a70d9..1bdbc1b49e 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -96,4 +96,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(DRACI_DETECTION, PLUGIN_TYPE_METAENGINE, DraciMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DRACI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DraciMetaEngineStatic);
diff --git a/engines/dragons/detection.cpp b/engines/dragons/detection.cpp
index d8eafd0d0a..240dbd0f58 100644
--- a/engines/dragons/detection.cpp
+++ b/engines/dragons/detection.cpp
@@ -143,4 +143,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(DRAGONS_DETECTION, PLUGIN_TYPE_METAENGINE, DragonsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DRAGONS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DragonsMetaEngineStatic);
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 1eb8468d7d..457d68c2d7 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -331,4 +331,4 @@ const ExtraGuiOptions DrasculaMetaEngineStatic::getExtraGuiOptions(const Common:
} // End of namespace Drascula
-REGISTER_PLUGIN_STATIC(DRASCULA_DETECTION, PLUGIN_TYPE_METAENGINE, Drascula::DrasculaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DRASCULA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Drascula::DrasculaMetaEngineStatic);
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index 4da74dc059..fa2864c415 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -83,4 +83,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(DREAMWEB_DETECTION, PLUGIN_TYPE_METAENGINE, DreamWebMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DREAMWEB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DreamWebMetaEngineStatic);
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index 9145484eb0..8679a08a11 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -239,4 +239,4 @@ const ExtraGuiOptions GlkMetaEngineStatic::getExtraGuiOptions(const Common::Stri
return options;
}
-REGISTER_PLUGIN_STATIC(GLK_DETECTION, PLUGIN_TYPE_METAENGINE, GlkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GLK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GlkMetaEngineStatic);
diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp
index 6f5a163ac5..e5505ab9b8 100644
--- a/engines/gnap/detection.cpp
+++ b/engines/gnap/detection.cpp
@@ -102,4 +102,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(GNAP_DETECTION, PLUGIN_TYPE_METAENGINE, GnapMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GNAP_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GnapMetaEngineStatic);
diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp
index f9fd1c61a4..303c0d7a9e 100644
--- a/engines/gob/detection/detection.cpp
+++ b/engines/gob/detection/detection.cpp
@@ -156,4 +156,4 @@ const char *GobMetaEngineStatic::getOriginalCopyright() const {
return "Goblins Games (C) Coktel Vision";
}
-REGISTER_PLUGIN_STATIC(GOB_DETECTION, PLUGIN_TYPE_METAENGINE, GobMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GOB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GobMetaEngineStatic);
diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index 74d6bc2718..5ac329943f 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -64,4 +64,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(GRIFFON_DETECTION, PLUGIN_TYPE_METAENGINE, GriffonMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GRIFFON_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GriffonMetaEngineStatic);
diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp
index 75a66f3e67..7bffe5bb32 100644
--- a/engines/grim/detection.cpp
+++ b/engines/grim/detection.cpp
@@ -613,4 +613,4 @@ public:
} // End of namespace Grim
-REGISTER_PLUGIN_STATIC(GRIM_DETECTION, PLUGIN_TYPE_METAENGINE, Grim::GrimMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GRIM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Grim::GrimMetaEngineStatic);
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 53e365153c..b39073c82a 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -361,4 +361,4 @@ public:
} // End of namespace Groovie
-REGISTER_PLUGIN_STATIC(GROOVIE_DETECTION, PLUGIN_TYPE_METAENGINE, Groovie::GroovieMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GROOVIE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Groovie::GroovieMetaEngineStatic);
diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp
index 01d21039f2..6f809a53dd 100644
--- a/engines/hdb/detection.cpp
+++ b/engines/hdb/detection.cpp
@@ -149,4 +149,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(HDB_DETECTION, PLUGIN_TYPE_METAENGINE, HDBMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(HDB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, HDBMetaEngineStatic);
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index d0f29f16c3..964752b8ad 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -84,4 +84,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(HOPKINS_DETECTION, PLUGIN_TYPE_METAENGINE, HopkinsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(HOPKINS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, HopkinsMetaEngineStatic);
diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index e35a75e1e5..28e16428ac 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -133,4 +133,4 @@ public:
} // End of namespace Hugo
-REGISTER_PLUGIN_STATIC(HUGO_DETECTION, PLUGIN_TYPE_METAENGINE, Hugo::HugoMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(HUGO_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Hugo::HugoMetaEngineStatic);
diff --git a/engines/icb/detection.cpp b/engines/icb/detection.cpp
index 8e59918322..af72169911 100644
--- a/engines/icb/detection.cpp
+++ b/engines/icb/detection.cpp
@@ -82,4 +82,4 @@ public:
} // End of namespace ICB
-REGISTER_PLUGIN_STATIC(ICB_DETECTION, PLUGIN_TYPE_METAENGINE, ICB::IcbMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ICB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ICB::IcbMetaEngineStatic);
diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index 6d9f1adba4..a1b2f2963a 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -130,4 +130,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(ILLUSIONS_DETECTION, PLUGIN_TYPE_METAENGINE, IllusionsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ILLUSIONS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, IllusionsMetaEngineStatic);
diff --git a/engines/kingdom/detection.cpp b/engines/kingdom/detection.cpp
index b5c5b5f4c4..d5ea36d067 100644
--- a/engines/kingdom/detection.cpp
+++ b/engines/kingdom/detection.cpp
@@ -90,4 +90,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(KINGDOM_DETECTION, PLUGIN_TYPE_METAENGINE, KingdomMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(KINGDOM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, KingdomMetaEngineStatic);
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 6538578bcf..0f7a8f580a 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -172,4 +172,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(KYRA_DETECTION, PLUGIN_TYPE_METAENGINE, KyraMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(KYRA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, KyraMetaEngineStatic);
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index b89e2739f9..1aeadb232f 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -122,4 +122,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(LAB_DETECTION, PLUGIN_TYPE_METAENGINE, LabMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LAB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LabMetaEngineStatic);
diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp
index cfb7373966..315f998f5d 100644
--- a/engines/lastexpress/detection.cpp
+++ b/engines/lastexpress/detection.cpp
@@ -231,4 +231,4 @@ public:
} // End of namespace LastExpress
-REGISTER_PLUGIN_STATIC(LASTEXPRESS_DETECTION, PLUGIN_TYPE_METAENGINE, LastExpress::LastExpressMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LASTEXPRESS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LastExpress::LastExpressMetaEngineStatic);
diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp
index 4013d5f319..bdb4e4dd44 100644
--- a/engines/lilliput/detection.cpp
+++ b/engines/lilliput/detection.cpp
@@ -124,4 +124,4 @@ public:
} // End of namespace Lilliput
-REGISTER_PLUGIN_STATIC(LILLIPUT_DETECTION, PLUGIN_TYPE_METAENGINE, Lilliput::LilliputMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LILLIPUT_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Lilliput::LilliputMetaEngineStatic);
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index f5ba70217e..bbc3aadae5 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -230,4 +230,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(LURE_DETECTION, PLUGIN_TYPE_METAENGINE, LureMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LURE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LureMetaEngineStatic);
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index c25fba2bfb..def0b5f785 100644
--- a/engines/macventure/detection.cpp
+++ b/engines/macventure/detection.cpp
@@ -72,4 +72,4 @@ public:
} // End of namespace MacVenture
-REGISTER_PLUGIN_STATIC(MACVENTURE_DETECTION, PLUGIN_TYPE_METAENGINE, MacVenture::MacVentureMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MACVENTURE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MacVenture::MacVentureMetaEngineStatic);
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index b76a80cfda..ed7b4e0a7c 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -70,4 +70,4 @@ ADDetectedGame MadeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, con
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(MADE_DETECTION, PLUGIN_TYPE_METAENGINE, MadeMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MADE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MadeMetaEngineStatic);
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index 2accf7fe27..0dfc0d6605 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -133,4 +133,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(MADS_DETECTION, PLUGIN_TYPE_METAENGINE, MADSMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MADS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MADSMetaEngineStatic);
diff --git a/engines/metaengine.h b/engines/metaengine.h
index 816a19f1da..95628c1e9e 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -469,9 +469,9 @@ public:
* By default, it will get METAENGINES, for now.
* If usage of actual engines never occurs, we can skip
* the default arguments, and always have it return
- * PLUGIN_TYPE_METAENGINE.
+ * PLUGIN_TYPE_ENGINE_DETECTION.
*/
- const PluginList &getPlugins(const PluginType fetchPluginType = PLUGIN_TYPE_METAENGINE) const;
+ const PluginList &getPlugins(const PluginType fetchPluginType = PLUGIN_TYPE_ENGINE_DETECTION) const;
/** Find a target */
QualifiedGameDescriptor findTarget(const Common::String &target, const Plugin **plugin = NULL) const;
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index d44739b302..cd36cc3d68 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -146,4 +146,4 @@ void MohawkMetaEngineStatic::registerDefaultSettings(const Common::String &targe
return AdvancedMetaEngineStatic::registerDefaultSettings(target);
}
-REGISTER_PLUGIN_STATIC(MOHAWK_DETECTION, PLUGIN_TYPE_METAENGINE, MohawkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MOHAWK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MohawkMetaEngineStatic);
diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp
index f9a7b1164f..c39290484e 100644
--- a/engines/mortevielle/detection.cpp
+++ b/engines/mortevielle/detection.cpp
@@ -56,4 +56,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(MORTEVIELLE_DETECTION, PLUGIN_TYPE_METAENGINE, MortevielleMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MORTEVIELLE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MortevielleMetaEngineStatic);
diff --git a/engines/mutationofjb/detection.cpp b/engines/mutationofjb/detection.cpp
index f29ef03768..aa9ae3828b 100644
--- a/engines/mutationofjb/detection.cpp
+++ b/engines/mutationofjb/detection.cpp
@@ -99,4 +99,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(MUTATIONOFJB_DETECTION, PLUGIN_TYPE_METAENGINE, MutationOfJBMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MUTATIONOFJB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MutationOfJBMetaEngineStatic);
diff --git a/engines/myst3/detection.cpp b/engines/myst3/detection.cpp
index 61d3c91d96..2756b664da 100644
--- a/engines/myst3/detection.cpp
+++ b/engines/myst3/detection.cpp
@@ -212,4 +212,4 @@ public:
} // End of namespace Myst3
-REGISTER_PLUGIN_STATIC(MYST3_DETECTION, PLUGIN_TYPE_METAENGINE, Myst3::Myst3MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MYST3_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Myst3::Myst3MetaEngineStatic);
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 5730c94480..236034a0da 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -159,4 +159,4 @@ const ExtraGuiOptions NeverhoodMetaEngineStatic::getExtraGuiOptions(const Common
return options;
}
-REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_METAENGINE, NeverhoodMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, NeverhoodMetaEngineStatic);
diff --git a/engines/ngi/detection.cpp b/engines/ngi/detection.cpp
index 8bb60e6e41..f546e6d7a7 100644
--- a/engines/ngi/detection.cpp
+++ b/engines/ngi/detection.cpp
@@ -159,4 +159,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_METAENGINE, NGIMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, NGIMetaEngineStatic);
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 3ebf1f410f..5be33c34eb 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -220,4 +220,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PARALLACTION_DETECTION, PLUGIN_TYPE_METAENGINE, ParallactionMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PARALLACTION_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ParallactionMetaEngineStatic);
diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp
index b14ea22bfb..0220c77175 100644
--- a/engines/pegasus/detection.cpp
+++ b/engines/pegasus/detection.cpp
@@ -109,4 +109,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PEGASUS_DETECTION, PLUGIN_TYPE_METAENGINE, PegasusMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PEGASUS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PegasusMetaEngineStatic);
diff --git a/engines/petka/detection.cpp b/engines/petka/detection.cpp
index 77e19299f2..98a5269d7e 100644
--- a/engines/petka/detection.cpp
+++ b/engines/petka/detection.cpp
@@ -53,4 +53,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PETKA_DETECTION, PLUGIN_TYPE_METAENGINE, PetkaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PETKA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PetkaMetaEngineStatic);
diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp
index 4d34fc7227..b7cf2794a2 100644
--- a/engines/pink/detection.cpp
+++ b/engines/pink/detection.cpp
@@ -59,4 +59,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PINK_DETECTION, PLUGIN_TYPE_METAENGINE, PinkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PINK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PinkMetaEngineStatic);
diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp
index 70c49f56ce..4993753c99 100644
--- a/engines/plumbers/detection.cpp
+++ b/engines/plumbers/detection.cpp
@@ -80,4 +80,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PLUMBERS_DETECTION, PLUGIN_TYPE_METAENGINE, PlumbersMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PLUMBERS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PlumbersMetaEngineStatic);
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 8de2113146..d281fba87c 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -141,4 +141,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PRINCE_DETECTION, PLUGIN_TYPE_METAENGINE, PrinceMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PRINCE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PrinceMetaEngineStatic);
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index f6afbb9cb5..ee3ce2785c 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -532,4 +532,4 @@ ADDetectedGame QueenMetaEngineStatic::fallbackDetect(const FileMap &allFiles, co
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(QUEEN_DETECTION, PLUGIN_TYPE_METAENGINE, QueenMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(QUEEN_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, QueenMetaEngineStatic);
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 25b58f254a..40a8a6e372 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -73,4 +73,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(SAGA_DETECTION, PLUGIN_TYPE_METAENGINE, SagaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SAGA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SagaMetaEngineStatic);
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 6e0e1c58d2..389fb61f85 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -478,4 +478,4 @@ ADDetectedGame SciMetaEngineStatic::fallbackDetect(const FileMap &allFiles, cons
} // End of namespace Sci
-REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_METAENGINE, Sci::SciMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sci::SciMetaEngineStatic);
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index edae12e2a7..4805bb8d9a 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -179,4 +179,4 @@ const ExtraGuiOptions ScummMetaEngineStatic::getExtraGuiOptions(const Common::St
return options;
}
-REGISTER_PLUGIN_STATIC(SCUMM_DETECTION, PLUGIN_TYPE_METAENGINE, ScummMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SCUMM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ScummMetaEngineStatic);
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 3e3bc162c8..e878cc2c1a 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -140,4 +140,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(SHERLOCK_DETECTION, PLUGIN_TYPE_METAENGINE, SherlockMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SHERLOCK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SherlockMetaEngineStatic);
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index e8140589fb..990bca7a50 100644
--- a/engines/sky/detection.cpp
+++ b/engines/sky/detection.cpp
@@ -175,4 +175,4 @@ DetectedGames SkyMetaEngineStatic::detectGames(const Common::FSList &fslist) con
return detectedGames;
}
-REGISTER_PLUGIN_STATIC(SKY_DETECTION, PLUGIN_TYPE_METAENGINE, SkyMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SKY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SkyMetaEngineStatic);
diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp
index c5392f600f..5d6244fb8c 100644
--- a/engines/sludge/detection.cpp
+++ b/engines/sludge/detection.cpp
@@ -146,4 +146,4 @@ ADDetectedGame SludgeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, c
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(SLUDGE_DETECTION, PLUGIN_TYPE_METAENGINE, SludgeMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SLUDGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SludgeMetaEngineStatic);
diff --git a/engines/stark/detection.cpp b/engines/stark/detection.cpp
index 78c1649220..f4aca81ee4 100644
--- a/engines/stark/detection.cpp
+++ b/engines/stark/detection.cpp
@@ -386,4 +386,4 @@ public:
} // End of namespace Stark
-REGISTER_PLUGIN_STATIC(STARK_DETECTION, PLUGIN_TYPE_METAENGINE, Stark::StarkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(STARK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Stark::StarkMetaEngineStatic);
diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index 73caac797e..a4dff83c3f 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -307,4 +307,4 @@ public:
-REGISTER_PLUGIN_STATIC(STARTREK_DETECTION, PLUGIN_TYPE_METAENGINE, StarTrekMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(STARTREK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, StarTrekMetaEngineStatic);
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp
index ef84049b02..8c24367308 100644
--- a/engines/supernova/detection.cpp
+++ b/engines/supernova/detection.cpp
@@ -120,4 +120,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(SUPERNOVA_DETECTION, PLUGIN_TYPE_METAENGINE, SupernovaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SUPERNOVA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SupernovaMetaEngineStatic);
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 421cf5437e..56e6ad1536 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -217,4 +217,4 @@ DetectedGames SwordMetaEngineStatic::detectGames(const Common::FSList &fslist) c
return detectedGames;
}
-REGISTER_PLUGIN_STATIC(SWORD1_DETECTION, PLUGIN_TYPE_METAENGINE, SwordMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SWORD1_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SwordMetaEngineStatic);
diff --git a/engines/sword2/detection.cpp b/engines/sword2/detection.cpp
index e9b6203e50..350e2bd632 100644
--- a/engines/sword2/detection.cpp
+++ b/engines/sword2/detection.cpp
@@ -101,4 +101,4 @@ DetectedGames Sword2MetaEngineStatic::detectGames(const Common::FSList &fslist)
return detectGamesImpl(fslist);
}
-REGISTER_PLUGIN_STATIC(SWORD2_DETECTION, PLUGIN_TYPE_METAENGINE, Sword2MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SWORD2_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sword2MetaEngineStatic);
diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp
index 9962cbf2c8..425684ca4b 100644
--- a/engines/sword25/detection.cpp
+++ b/engines/sword25/detection.cpp
@@ -73,4 +73,4 @@ const ExtraGuiOptions Sword25MetaEngineStatic::getExtraGuiOptions(const Common::
return options;
}
-REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_METAENGINE, Sword25MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sword25MetaEngineStatic);
diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp
index 623603dd2e..0a90d48b8f 100644
--- a/engines/teenagent/detection.cpp
+++ b/engines/teenagent/detection.cpp
@@ -96,4 +96,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TEENAGENT_DETECTION, PLUGIN_TYPE_METAENGINE, TeenAgentMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TEENAGENT_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TeenAgentMetaEngineStatic);
diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp
index 90180fc1fe..25ddb7836f 100644
--- a/engines/testbed/detection.cpp
+++ b/engines/testbed/detection.cpp
@@ -61,4 +61,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TESTBED_DETECTION, PLUGIN_TYPE_METAENGINE, TestbedMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TESTBED_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TestbedMetaEngineStatic);
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 13eed4bb39..d075f26327 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -204,4 +204,4 @@ ADDetectedGame TinselMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX
return matched;
}
-REGISTER_PLUGIN_STATIC(TINSEL_DETECTION, PLUGIN_TYPE_METAENGINE, TinselMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TINSEL_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TinselMetaEngineStatic);
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index f71f76d9a4..b97fcdb188 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -53,4 +53,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TITANIC_DETECTION, PLUGIN_TYPE_METAENGINE, TitanicMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TITANIC_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TitanicMetaEngineStatic);
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index a4b7e1d3ae..d2828eea9f 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -242,4 +242,4 @@ const ExtraGuiOptions ToltecsMetaEngineStatic::getExtraGuiOptions(const Common::
return options;
}
-REGISTER_PLUGIN_STATIC(TOLTECS_DETECTION, PLUGIN_TYPE_METAENGINE, ToltecsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TOLTECS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToltecsMetaEngineStatic);
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 9708f1564f..769af73a7e 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -51,4 +51,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TONY_DETECTION, PLUGIN_TYPE_METAENGINE, TonyMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TONY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TonyMetaEngineStatic);
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 3636fde323..1d518f49e6 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -154,4 +154,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TOON_DETECTION, PLUGIN_TYPE_METAENGINE, ToonMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TOON_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToonMetaEngineStatic);
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 98de9aa8ad..14f77091c9 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -144,4 +144,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TOUCHE_DETECTION, PLUGIN_TYPE_METAENGINE, ToucheMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TOUCHE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToucheMetaEngineStatic);
diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index f7ec40c90f..57c9eb2dac 100644
--- a/engines/tsage/detection.cpp
+++ b/engines/tsage/detection.cpp
@@ -54,4 +54,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TSAGE_DETECTION, PLUGIN_TYPE_METAENGINE, TSageMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TSAGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TSageMetaEngineStatic);
diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp
index e0cbc9a5d3..638515bfe9 100644
--- a/engines/tucker/detection.cpp
+++ b/engines/tucker/detection.cpp
@@ -151,4 +151,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(TUCKER_DETECTION, PLUGIN_TYPE_METAENGINE, TuckerMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TUCKER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TuckerMetaEngineStatic);
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index 3ee021a995..ce95c9aa96 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -56,4 +56,4 @@ UltimaMetaEngineStatic::UltimaMetaEngineStatic() : AdvancedMetaEngineStatic(Ulti
_directoryGlobs = DIRECTORY_GLOBS;
}
-REGISTER_PLUGIN_STATIC(ULTIMA_DETECTION, PLUGIN_TYPE_METAENGINE, UltimaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ULTIMA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, UltimaMetaEngineStatic);
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 8c93164d04..3ba72008a6 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -53,4 +53,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(VOYEUR_DETECTION, PLUGIN_TYPE_METAENGINE, VoyeurMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(VOYEUR_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, VoyeurMetaEngineStatic);
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index 7432e4d4fd..f30356be55 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -59,4 +59,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(WAGE_DETECTION, PLUGIN_TYPE_METAENGINE, WageMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(WAGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, WageMetaEngineStatic);
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index 4318d7e0b1..abfe1256f7 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -123,4 +123,4 @@ public:
} // End of namespace Wintermute
-REGISTER_PLUGIN_STATIC(WINTERMUTE_DETECTION, PLUGIN_TYPE_METAENGINE, Wintermute::WintermuteMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(WINTERMUTE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Wintermute::WintermuteMetaEngineStatic);
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index 816788ce7b..dfccf971c2 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -84,4 +84,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(XEEN_DETECTION, PLUGIN_TYPE_METAENGINE, XeenMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(XEEN_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, XeenMetaEngineStatic);
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 52c149b955..aac7c32ad7 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -52,4 +52,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(ZVISION_DETECTION, PLUGIN_TYPE_METAENGINE, ZVisionMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ZVISION_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ZVisionMetaEngineStatic);
Commit: 7ff34bc9ec93c8e3e7867112755bacd3ca8d1dc4
https://github.com/scummvm/scummvm/commit/7ff34bc9ec93c8e3e7867112755bacd3ca8d1dc4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-11T23:14:39+02:00
Commit Message:
PLUGINS: MetaEngineStatic -> MetaEngineDetection
Changed paths:
base/commandLine.cpp
base/main.cpp
base/plugins.cpp
engines/access/detection.cpp
engines/adl/detection.cpp
engines/advancedDetector.cpp
engines/advancedDetector.h
engines/agi/detection.cpp
engines/agos/detection.cpp
engines/avalanche/detection.cpp
engines/bbvs/detection.cpp
engines/bladerunner/detection.cpp
engines/cge/detection.cpp
engines/cge2/detection.cpp
engines/chewy/detection.cpp
engines/cine/detection.cpp
engines/composer/detection.cpp
engines/cruise/detection.cpp
engines/cryo/detection.cpp
engines/cryomni3d/detection.cpp
engines/director/detection.cpp
engines/dm/detection.cpp
engines/draci/detection.cpp
engines/dragons/detection.cpp
engines/drascula/detection.cpp
engines/dreamweb/detection.cpp
engines/engine.cpp
engines/engine.h
engines/glk/detection.cpp
engines/glk/detection.h
engines/glk/metaengine.cpp
engines/gnap/detection.cpp
engines/gob/detection/detection.cpp
engines/griffon/detection.cpp
engines/grim/detection.cpp
engines/groovie/detection.cpp
engines/hdb/detection.cpp
engines/hopkins/detection.cpp
engines/hugo/detection.cpp
engines/icb/detection.cpp
engines/illusions/detection.cpp
engines/kingdom/detection.cpp
engines/kyra/detection.cpp
engines/lab/detection.cpp
engines/lastexpress/detection.cpp
engines/lilliput/detection.cpp
engines/lure/detection.cpp
engines/macventure/detection.cpp
engines/made/detection.cpp
engines/mads/detection.cpp
engines/metaengine.cpp
engines/metaengine.h
engines/mohawk/detection.cpp
engines/mortevielle/detection.cpp
engines/mutationofjb/detection.cpp
engines/myst3/detection.cpp
engines/neverhood/detection.cpp
engines/ngi/detection.cpp
engines/parallaction/detection.cpp
engines/pegasus/detection.cpp
engines/petka/detection.cpp
engines/pink/detection.cpp
engines/plumbers/detection.cpp
engines/prince/detection.cpp
engines/queen/detection.cpp
engines/saga/detection.cpp
engines/sci/detection.cpp
engines/scumm/detection.cpp
engines/sherlock/detection.cpp
engines/sky/detection.cpp
engines/sludge/detection.cpp
engines/stark/detection.cpp
engines/startrek/detection.cpp
engines/supernova/detection.cpp
engines/sword1/detection.cpp
engines/sword2/detection.cpp
engines/sword25/detection.cpp
engines/teenagent/detection.cpp
engines/testbed/detection.cpp
engines/tinsel/detection.cpp
engines/titanic/detection.cpp
engines/toltecs/detection.cpp
engines/tony/detection.cpp
engines/toon/detection.cpp
engines/touche/detection.cpp
engines/tsage/detection.cpp
engines/tucker/detection.cpp
engines/ultima/detection.cpp
engines/ultima/detection.h
engines/voyeur/detection.cpp
engines/wage/detection.cpp
engines/wintermute/detection.cpp
engines/xeen/detection.cpp
engines/zvision/detection.cpp
gui/about.cpp
gui/editgamedialog.cpp
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 1d8ad6bba8..16143232de 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -820,7 +820,7 @@ static void listGames() {
const PluginList &plugins = EngineMan.getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {
- const MetaEngineStatic &metaengine = (*iter)->get<MetaEngineStatic>();
+ const MetaEngineDetection &metaengine = (*iter)->get<MetaEngineDetection>();
PlainGameList list = metaengine.getSupportedGames();
for (PlainGameList::const_iterator v = list.begin(); v != list.end(); ++v) {
@@ -836,7 +836,7 @@ static void listEngines() {
const PluginList &plugins = EngineMan.getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {
- const MetaEngineStatic &metaEngine = (*iter)->get<MetaEngineStatic>();
+ const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
printf("%-15s %s\n", metaEngine.getEngineId(), metaEngine.getName());
}
}
diff --git a/base/main.cpp b/base/main.cpp
index 279bbe2660..e2cb980e0c 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -133,7 +133,7 @@ static const Plugin *detectPlugin() {
// Query the plugin for the game descriptor
printf(" Looking for a plugin supporting this target... %s\n", plugin->getName());
- PlainGameDescriptor game = plugin->get<MetaEngineStatic>().findGame(gameId.c_str());
+ PlainGameDescriptor game = plugin->get<MetaEngineDetection>().findGame(gameId.c_str());
if (!game.gameId) {
warning("'%s' is an invalid game ID for the engine '%s'. Use the --list-games option to list supported game IDs", gameId.c_str(), engineId.c_str());
return 0;
@@ -182,7 +182,7 @@ static Common::Error runGame(const Plugin *plugin, OSystem &system, const Common
}
// Create the game's MetaEngine.
- const MetaEngineStatic &metaEngine = plugin->get<MetaEngineStatic>();
+ const MetaEngineDetection &metaEngine = plugin->get<MetaEngineDetection>();
if (err.getCode() == Common::kNoError) {
// Set default values for all of the custom engine options
// Apparently some engines query them in their constructor, thus we
diff --git a/base/plugins.cpp b/base/plugins.cpp
index ea536ca203..819dcb30b3 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -636,7 +636,7 @@ QualifiedGameList EngineManager::findGamesMatching(const Common::String &engineI
// If we got an engine name, look for THE game only in that engine
const Plugin *p = EngineMan.findPlugin(engineId);
if (p) {
- const MetaEngineStatic &engine = p->get<MetaEngineStatic>();
+ const MetaEngineDetection &engine = p->get<MetaEngineDetection>();
PlainGameDescriptor pluginResult = engine.findGame(gameId.c_str());
if (pluginResult.gameId) {
@@ -665,7 +665,7 @@ QualifiedGameList EngineManager::findGameInLoadedPlugins(const Common::String &g
PluginList::const_iterator iter;
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
- const MetaEngineStatic &engine = (*iter)->get<MetaEngineStatic>();
+ const MetaEngineDetection &engine = (*iter)->get<MetaEngineDetection>();
PlainGameDescriptor pluginResult = engine.findGame(gameId.c_str());
if (pluginResult.gameId) {
@@ -688,7 +688,7 @@ DetectionResults EngineManager::detectGames(const Common::FSList &fslist) const
// Iterate over all known games and for each check if it might be
// the game in the presented directory.
for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
- const MetaEngineStatic &metaEngine = (*iter)->get<MetaEngineStatic>();
+ const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
DetectedGames engineCandidates = metaEngine.detectGames(fslist);
for (uint i = 0; i < engineCandidates.size(); i++) {
@@ -766,7 +766,7 @@ const Plugin *EngineManager::findLoadedPlugin(const Common::String &engineId) co
const PluginList &plugins = getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); iter++)
- if (engineId == (*iter)->get<MetaEngineStatic>().getEngineId())
+ if (engineId == (*iter)->get<MetaEngineDetection>().getEngineId())
return *iter;
return 0;
@@ -818,7 +818,7 @@ QualifiedGameDescriptor EngineManager::findTarget(const Common::String &target,
}
// Make sure it does support the game ID
- const MetaEngineStatic &engine = foundPlugin->get<MetaEngineStatic>();
+ const MetaEngineDetection &engine = foundPlugin->get<MetaEngineDetection>();
PlainGameDescriptor desc = engine.findGame(domain->getVal("gameid").c_str());
if (!desc.gameId) {
return QualifiedGameDescriptor();
@@ -883,7 +883,7 @@ void EngineManager::upgradeTargetForEngineId(const Common::String &target) const
}
// Take the first detection entry
- const MetaEngineStatic &metaEngine = plugin->get<MetaEngineStatic>();
+ const MetaEngineDetection &metaEngine = plugin->get<MetaEngineDetection>();
DetectedGames candidates = metaEngine.detectGames(files);
if (candidates.empty()) {
warning("No games supported by the engine '%s' were found in path '%s' when upgrading target '%s'",
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 982a648b30..41b5d7e97b 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 AccessMetaEngineStatic : public AdvancedMetaEngineStatic {
+class AccessMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- AccessMetaEngineStatic() : AdvancedMetaEngineStatic(Access::gameDescriptions, sizeof(Access::AccessGameDescription), AccessGames) {
+ AccessMetaEngineDetection() : AdvancedMetaEngineDetection(Access::gameDescriptions, sizeof(Access::AccessGameDescription), AccessGames) {
_maxScanDepth = 3;
}
@@ -52,4 +52,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(ACCESS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AccessMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ACCESS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AccessMetaEngineDetection);
diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index a27b7ab1fa..e175144bf2 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 AdlMetaEngineStatic : public AdvancedMetaEngineStatic {
+class AdlMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- AdlMetaEngineStatic() : AdvancedMetaEngineStatic(gameFileDescriptions, sizeof(AdlGameDescription), adlGames, optionsList) { }
+ AdlMetaEngineDetection() : AdvancedMetaEngineDetection(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 AdlMetaEngineStatic::addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const {
+bool AdlMetaEngineDetection::addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const {
if (filePropsMap.contains(fname))
return true;
@@ -377,9 +377,9 @@ bool AdlMetaEngineStatic::addFileProps(const FileMap &allFiles, Common::String f
}
// Based on AdvancedMetaEngine::detectGame
-ADDetectedGames AdlMetaEngineStatic::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const {
+ADDetectedGames AdlMetaEngineDetection::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 = AdvancedMetaEngineStatic::detectGame(parent, allFiles, language, platform, extra);
+ ADDetectedGames matched = AdvancedMetaEngineDetection::detectGame(parent, allFiles, language, platform, extra);
if (!matched.empty())
return matched;
@@ -474,4 +474,4 @@ ADDetectedGames AdlMetaEngineStatic::detectGame(const Common::FSNode &parent, co
} // End of namespace Adl
-REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Adl::AdlMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Adl::AdlMetaEngineDetection);
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 21d8d56b88..f79a9e75ac 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -40,7 +40,7 @@
*/
class FileMapArchive : public Common::Archive {
public:
- FileMapArchive(const AdvancedMetaEngineStatic::FileMap &fileMap) : _fileMap(fileMap) {}
+ FileMapArchive(const AdvancedMetaEngineDetection::FileMap &fileMap) : _fileMap(fileMap) {}
bool hasFile(const Common::String &name) const override {
return _fileMap.contains(name);
@@ -48,7 +48,7 @@ public:
int listMembers(Common::ArchiveMemberList &list) const override {
int files = 0;
- for (AdvancedMetaEngineStatic::FileMap::const_iterator it = _fileMap.begin(); it != _fileMap.end(); ++it) {
+ for (AdvancedMetaEngineDetection::FileMap::const_iterator it = _fileMap.begin(); it != _fileMap.end(); ++it) {
list.push_back(Common::ArchiveMemberPtr(new Common::FSNode(it->_value)));
++files;
}
@@ -57,7 +57,7 @@ public:
}
const Common::ArchiveMemberPtr getMember(const Common::String &name) const override {
- AdvancedMetaEngineStatic::FileMap::const_iterator it = _fileMap.find(name);
+ AdvancedMetaEngineDetection::FileMap::const_iterator it = _fileMap.find(name);
if (it == _fileMap.end()) {
return Common::ArchiveMemberPtr();
}
@@ -71,7 +71,7 @@ public:
}
private:
- const AdvancedMetaEngineStatic::FileMap &_fileMap;
+ const AdvancedMetaEngineDetection::FileMap &_fileMap;
};
static Common::String sanitizeName(const char *name) {
@@ -124,7 +124,7 @@ static Common::String generatePreferredTarget(const ADGameDescription *desc) {
return res;
}
-DetectedGame AdvancedMetaEngineStatic::toDetectedGame(const ADDetectedGame &adGame) const {
+DetectedGame AdvancedMetaEngineDetection::toDetectedGame(const ADDetectedGame &adGame) const {
const ADGameDescription *desc = adGame.desc;
const char *title;
@@ -190,7 +190,7 @@ bool cleanupPirated(ADDetectedGames &matched) {
}
-DetectedGames AdvancedMetaEngineStatic::detectGames(const Common::FSList &fslist) const {
+DetectedGames AdvancedMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
FileMap allFiles;
if (fslist.empty())
@@ -236,7 +236,7 @@ DetectedGames AdvancedMetaEngineStatic::detectGames(const Common::FSList &fslist
return detectedGames;
}
-const ExtraGuiOptions AdvancedMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions AdvancedMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
if (!_extraGuiOptions)
return ExtraGuiOptions();
@@ -264,7 +264,7 @@ const ExtraGuiOptions AdvancedMetaEngineStatic::getExtraGuiOptions(const Common:
return options;
}
-Common::Error AdvancedMetaEngineStatic::createInstance(OSystem *syst, Engine **engine) const {
+Common::Error AdvancedMetaEngineDetection::createInstance(OSystem *syst, Engine **engine) const {
assert(engine);
Common::Language language = Common::UNK_LANG;
@@ -371,7 +371,7 @@ Common::Error AdvancedMetaEngineStatic::createInstance(OSystem *syst, Engine **e
return Common::Error(Common::kNoGameDataFoundError);
}
-void AdvancedMetaEngineStatic::composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth, const Common::String &parentName) const {
+void AdvancedMetaEngineDetection::composeFileHashMap(FileMap &allFiles, const Common::FSList &fslist, int depth, const Common::String &parentName) const {
if (depth <= 0)
return;
@@ -411,7 +411,7 @@ void AdvancedMetaEngineStatic::composeFileHashMap(FileMap &allFiles, const Commo
}
}
-bool AdvancedMetaEngineStatic::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
+bool AdvancedMetaEngineDetection::getFileProperties(const FileMap &allFiles, const ADGameDescription &game, const Common::String fname, FileProperties &fileProps) const {
// FIXME/TODO: We don't handle the case that a file is listed as a regular
// file and as one with resource fork.
@@ -475,7 +475,7 @@ bool AdvancedMetaEngine::getFilePropertiesExtern(uint md5Bytes, const FileMap &a
return true;
}
-ADDetectedGames AdvancedMetaEngineStatic::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const {
+ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const {
FilePropertiesMap filesProps;
ADDetectedGames matched;
@@ -600,7 +600,7 @@ ADDetectedGames AdvancedMetaEngineStatic::detectGame(const Common::FSNode &paren
return matched;
}
-ADDetectedGame AdvancedMetaEngineStatic::detectGameFilebased(const FileMap &allFiles, const ADFileBasedFallback *fileBasedFallback) const {
+ADDetectedGame AdvancedMetaEngineDetection::detectGameFilebased(const FileMap &allFiles, const ADFileBasedFallback *fileBasedFallback) const {
const ADFileBasedFallback *ptr;
const char* const* filenames;
@@ -648,11 +648,11 @@ ADDetectedGame AdvancedMetaEngineStatic::detectGameFilebased(const FileMap &allF
return result;
}
-PlainGameList AdvancedMetaEngineStatic::getSupportedGames() const {
+PlainGameList AdvancedMetaEngineDetection::getSupportedGames() const {
return PlainGameList(_gameIds);
}
-PlainGameDescriptor AdvancedMetaEngineStatic::findGame(const char *gameId) const {
+PlainGameDescriptor AdvancedMetaEngineDetection::findGame(const char *gameId) const {
// First search the list of supported gameids for a match.
const PlainGameDescriptor *g = findPlainGameDescriptor(gameId, _gameIds);
if (g)
@@ -662,7 +662,7 @@ PlainGameDescriptor AdvancedMetaEngineStatic::findGame(const char *gameId) const
return PlainGameDescriptor::empty();
}
-AdvancedMetaEngineStatic::AdvancedMetaEngineStatic(const void *descs, uint descItemSize, const PlainGameDescriptor *gameIds, const ADExtraGuiOptionsMap *extraGuiOptions)
+AdvancedMetaEngineDetection::AdvancedMetaEngineDetection(const void *descs, uint descItemSize, const PlainGameDescriptor *gameIds, const ADExtraGuiOptionsMap *extraGuiOptions)
: _gameDescriptors((const byte *)descs), _descItemSize(descItemSize), _gameIds(gameIds),
_extraGuiOptions(extraGuiOptions) {
@@ -674,7 +674,7 @@ AdvancedMetaEngineStatic::AdvancedMetaEngineStatic(const void *descs, uint descI
_matchFullPaths = false;
}
-void AdvancedMetaEngineStatic::initSubSystems(const ADGameDescription *gameDesc) const {
+void AdvancedMetaEngineDetection::initSubSystems(const ADGameDescription *gameDesc) const {
#ifdef ENABLE_EVENTRECORDER
if (gameDesc) {
g_eventRec.processGameDescription(gameDesc);
@@ -687,7 +687,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
if (pl.size() == 1) {
Plugin *metaEnginePlugin = PluginMan.getMetaEngineFromEngine(pl[0]);
if (metaEnginePlugin) {
- return metaEnginePlugin->get<AdvancedMetaEngineStatic>().createInstance(syst, engine);
+ return metaEnginePlugin->get<AdvancedMetaEngineDetection>().createInstance(syst, engine);
}
}
diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index b7aca7b05d..b7e2396b0e 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -167,9 +167,9 @@ struct ADExtraGuiOptionsMap {
#define AD_EXTRA_GUI_OPTIONS_TERMINATOR { 0, { 0, 0, 0, 0 } }
/**
- * A MetaEngineStatic implementation based around the advanced detector code.
+ * A MetaEngineDetection implementation based around the advanced detector code.
*/
-class AdvancedMetaEngineStatic : public MetaEngineStatic {
+class AdvancedMetaEngineDetection : public MetaEngineDetection {
protected:
/**
* Pointer to an array of objects which are either ADGameDescription
@@ -247,7 +247,7 @@ protected:
bool _matchFullPaths;
public:
- AdvancedMetaEngineStatic(const void *descs, uint descItemSize, const PlainGameDescriptor *gameIds, const ADExtraGuiOptionsMap *extraGuiOptions = 0);
+ AdvancedMetaEngineDetection(const void *descs, uint descItemSize, const PlainGameDescriptor *gameIds, const ADExtraGuiOptionsMap *extraGuiOptions = 0);
/**
* Returns list of targets supported by the engine.
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index f2a89c78b9..aa2b989031 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -131,12 +131,12 @@ static const ADExtraGuiOptionsMap optionsList[] = {
using namespace Agi;
-class AgiMetaEngineStatic : public AdvancedMetaEngineStatic {
+class AgiMetaEngineDetection : public AdvancedMetaEngineDetection {
mutable Common::String _gameid;
mutable Common::String _extra;
public:
- AgiMetaEngineStatic() : AdvancedMetaEngineStatic(Agi::gameDescriptions, sizeof(Agi::AGIGameDescription), agiGames, optionsList) {
+ AgiMetaEngineDetection() : AdvancedMetaEngineDetection(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 AgiMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const {
+ADDetectedGame AgiMetaEngineDetection::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const {
typedef Common::HashMap<Common::String, int32> IntMap;
IntMap allFiles;
bool matchedUsingFilenames = false;
@@ -323,4 +323,4 @@ ADDetectedGame AgiMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX, c
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AgiMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(AGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AgiMetaEngineDetection);
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index a8a381b485..d02ef0ffb8 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -65,9 +65,9 @@ static const char *const directoryGlobs[] = {
using namespace AGOS;
-class AgosMetaEngineStatic : public AdvancedMetaEngineStatic {
+class AgosMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- AgosMetaEngineStatic() : AdvancedMetaEngineStatic(AGOS::gameDescriptions, sizeof(AGOS::AGOSGameDescription), agosGames) {
+ AgosMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, AgosMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(AGOS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, AgosMetaEngineDetection);
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 14a2c64ab4..e3ae30a70f 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -56,9 +56,9 @@ static const ADGameDescription gameDescriptions[] = {
AD_TABLE_END_MARKER
};
-class AvalancheMetaEngineStatic : public AdvancedMetaEngineStatic {
+class AvalancheMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- AvalancheMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(AvalancheGameDescription), avalancheGames) {
+ AvalancheMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, Avalanche::AvalancheMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(AVALANCHE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Avalanche::AvalancheMetaEngineDetection);
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index 4245551037..aaeccf33f8 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -83,9 +83,9 @@ static const char * const directoryGlobs[] = {
0
};
-class BbvsMetaEngineStatic : public AdvancedMetaEngineStatic {
+class BbvsMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- BbvsMetaEngineStatic() : AdvancedMetaEngineStatic(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) {
+ BbvsMetaEngineDetection() : AdvancedMetaEngineDetection(Bbvs::gameDescriptions, sizeof(ADGameDescription), bbvsGames) {
_maxScanDepth = 3;
_directoryGlobs = directoryGlobs;
}
@@ -103,4 +103,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, BbvsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, BbvsMetaEngineDetection);
diff --git a/engines/bladerunner/detection.cpp b/engines/bladerunner/detection.cpp
index dcb6ffafe6..b912bc81e7 100644
--- a/engines/bladerunner/detection.cpp
+++ b/engines/bladerunner/detection.cpp
@@ -92,32 +92,32 @@ static const ADExtraGuiOptionsMap optionsList[] = {
} // End of namespace BladeRunner
-class BladeRunnerMetaEngineStatic : public AdvancedMetaEngineStatic {
+class BladeRunnerMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- BladeRunnerMetaEngineStatic();
+ BladeRunnerMetaEngineDetection();
const char *getEngineId() const override;
const char *getName() const override;
const char *getOriginalCopyright() const override;
};
-BladeRunnerMetaEngineStatic::BladeRunnerMetaEngineStatic()
- : AdvancedMetaEngineStatic(
+BladeRunnerMetaEngineDetection::BladeRunnerMetaEngineDetection()
+ : AdvancedMetaEngineDetection(
BladeRunner::gameDescriptions,
sizeof(BladeRunner::gameDescriptions[0]),
BladeRunner::bladeRunnerGames,
BladeRunner::optionsList) {}
-const char *BladeRunnerMetaEngineStatic::getEngineId() const {
+const char *BladeRunnerMetaEngineDetection::getEngineId() const {
return "bladerunner";
}
-const char *BladeRunnerMetaEngineStatic::getName() const {
+const char *BladeRunnerMetaEngineDetection::getName() const {
return "Blade Runner";
}
-const char *BladeRunnerMetaEngineStatic::getOriginalCopyright() const {
+const char *BladeRunnerMetaEngineDetection::getOriginalCopyright() const {
return "Blade Runner (C) 1997 Westwood Studios";
}
-REGISTER_PLUGIN_STATIC(BLADERUNNER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, BladeRunnerMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(BLADERUNNER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, BladeRunnerMetaEngineDetection);
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 22668d51f3..924323a812 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 CGEMetaEngineStatic : public AdvancedMetaEngineStatic {
+class CGEMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- CGEMetaEngineStatic() : AdvancedMetaEngineStatic(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) {
+ CGEMetaEngineDetection() : AdvancedMetaEngineDetection(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) {
}
const char *getEngineId() const override {
@@ -155,19 +155,19 @@ static const ADFileBasedFallback fileBasedFallback[] = {
{ 0, { 0 } }
};
-ADDetectedGame CGEMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame CGEMetaEngineDetection::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
ADDetectedGame game = detectGameFilebased(allFiles, CGE::fileBasedFallback);
if (!game.desc)
return ADDetectedGame();
- SearchMan.addDirectory("CGEMetaEngineStatic::fallbackDetect", fslist.begin()->getParent());
+ SearchMan.addDirectory("CGEMetaEngineDetection::fallbackDetect", fslist.begin()->getParent());
ResourceManager *resman;
resman = new ResourceManager();
bool sayFileFound = resman->exist("CGE.SAY");
delete resman;
- SearchMan.remove("CGEMetaEngineStatic::fallbackDetect");
+ SearchMan.remove("CGEMetaEngineDetection::fallbackDetect");
if (!sayFileFound)
return ADDetectedGame();
@@ -177,4 +177,4 @@ ADDetectedGame CGEMetaEngineStatic::fallbackDetect(const FileMap &allFiles, cons
} // End of namespace CGE
-REGISTER_PLUGIN_STATIC(CGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CGE::CGEMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CGE::CGEMetaEngineDetection);
diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index ffe99a2f00..89ac7b1db4 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 CGE2MetaEngineStatic : public AdvancedMetaEngineStatic {
+class CGE2MetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- CGE2MetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) {
+ CGE2MetaEngineDetection() : AdvancedMetaEngineDetection(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 CGE2MetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame CGE2MetaEngineDetection::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
ADDetectedGame game = detectGameFilebased(allFiles, CGE2::fileBasedFallback);
if (!game.desc)
return ADDetectedGame();
- SearchMan.addDirectory("CGE2MetaEngineStatic::fallbackDetect", fslist.begin()->getParent());
+ SearchMan.addDirectory("CGE2MetaEngineDetection::fallbackDetect", fslist.begin()->getParent());
ResourceManager *resman;
resman = new ResourceManager();
bool sayFileFound = resman->exist("CGE.SAY");
delete resman;
- SearchMan.remove("CGE2MetaEngineStatic::fallbackDetect");
+ SearchMan.remove("CGE2MetaEngineDetection::fallbackDetect");
if (!sayFileFound)
return ADDetectedGame();
@@ -175,4 +175,4 @@ ADDetectedGame CGE2MetaEngineStatic::fallbackDetect(const FileMap &allFiles, con
} // End of namespace CGE2
-REGISTER_PLUGIN_STATIC(CGE2_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CGE2::CGE2MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CGE2_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CGE2::CGE2MetaEngineDetection);
diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp
index 2f5ac9cbef..60d05fca2e 100644
--- a/engines/chewy/detection.cpp
+++ b/engines/chewy/detection.cpp
@@ -90,9 +90,9 @@ static const ChewyGameDescription gameDescriptions[] = {
} // End of namespace Chewy
-class ChewyMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ChewyMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ChewyMetaEngineStatic() : AdvancedMetaEngineStatic(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) {
+ ChewyMetaEngineDetection() : AdvancedMetaEngineDetection(Chewy::gameDescriptions, sizeof(Chewy::ChewyGameDescription), chewyGames) {
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
@@ -110,4 +110,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CHEWY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ChewyMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CHEWY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ChewyMetaEngineDetection);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index c196350f41..561cba8e6c 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 CineMetaEngineStatic : public AdvancedMetaEngineStatic {
+class CineMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- CineMetaEngineStatic() : AdvancedMetaEngineStatic(Cine::gameDescriptions, sizeof(Cine::CINEGameDescription), cineGames, optionsList) {
+ CineMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, CineMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CINE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CineMetaEngineDetection);
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index a7555519c9..1aa74b3cd2 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -52,9 +52,9 @@ static const char *directoryGlobs[] = {
0
};
-class ComposerMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ComposerMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ComposerMetaEngineStatic() : AdvancedMetaEngineStatic(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) {
+ ComposerMetaEngineDetection() : AdvancedMetaEngineDetection(Composer::gameDescriptions, sizeof(Composer::ComposerGameDescription), composerGames) {
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
@@ -72,4 +72,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ComposerMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(COMPOSER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ComposerMetaEngineDetection);
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 22027fce54..bf76c0dc9d 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -170,9 +170,9 @@ static const CRUISEGameDescription gameDescriptions[] = {
}
-class CruiseMetaEngineStatic : public AdvancedMetaEngineStatic {
+class CruiseMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- CruiseMetaEngineStatic() : AdvancedMetaEngineStatic(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) {
+ CruiseMetaEngineDetection() : AdvancedMetaEngineDetection(Cruise::gameDescriptions, sizeof(Cruise::CRUISEGameDescription), cruiseGames) {
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
}
@@ -189,4 +189,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CRUISE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CruiseMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CRUISE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CruiseMetaEngineDetection);
diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp
index 443e88e9fb..7f534100c2 100644
--- a/engines/cryo/detection.cpp
+++ b/engines/cryo/detection.cpp
@@ -119,9 +119,9 @@ static const ADGameDescription gameDescriptions[] = {
} // End of namespace Cryo
-class CryoMetaEngineStatic : public AdvancedMetaEngineStatic {
+class CryoMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- CryoMetaEngineStatic() : AdvancedMetaEngineStatic(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) {
+ CryoMetaEngineDetection() : AdvancedMetaEngineDetection(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) {
}
const char *getEngineId() const override {
@@ -137,4 +137,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(CRYO_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CryoMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CRYO_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CryoMetaEngineDetection);
diff --git a/engines/cryomni3d/detection.cpp b/engines/cryomni3d/detection.cpp
index f247ac26cd..a55914c410 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 CryOmni3DMetaEngineStatic : public AdvancedMetaEngineStatic {
+class CryOmni3DMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- CryOmni3DMetaEngineStatic() : AdvancedMetaEngineStatic(CryOmni3D::gameDescriptions,
+ CryOmni3DMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, CryOmni3D::CryOmni3DMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(CRYOMNI3D_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, CryOmni3D::CryOmni3DMetaEngineDetection);
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 02eeec76a4..82cbb7928f 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -174,9 +174,9 @@ static const char *directoryGlobs[] = {
0
};
-class DirectorMetaEngineStatic : public AdvancedMetaEngineStatic {
+class DirectorMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- DirectorMetaEngineStatic() : AdvancedMetaEngineStatic(Director::gameDescriptions, sizeof(Director::DirectorGameDescription), directorGames) {
+ DirectorMetaEngineDetection() : AdvancedMetaEngineDetection(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 DirectorMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame DirectorMetaEngineDetection::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
// TODO: Handle Mac fallback
// reset fallback description
@@ -321,4 +321,4 @@ ADDetectedGame DirectorMetaEngineStatic::fallbackDetect(const FileMap &allFiles,
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(DIRECTOR_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DirectorMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DIRECTOR_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DirectorMetaEngineDetection);
diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp
index 78bdb2846c..c426cb39c2 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 DMMetaEngineStatic : public AdvancedMetaEngineStatic {
+class DMMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- DMMetaEngineStatic() : AdvancedMetaEngineStatic(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) {
+ DMMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, DM::DMMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DM::DMMetaEngineDetection);
diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index 1bdbc1b49e..0f787a0748 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -78,9 +78,9 @@ const ADGameDescription gameDescriptions[] = {
} // End of namespace Draci
-class DraciMetaEngineStatic : public AdvancedMetaEngineStatic {
+class DraciMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- DraciMetaEngineStatic() : AdvancedMetaEngineStatic(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) {
+ DraciMetaEngineDetection() : AdvancedMetaEngineDetection(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) {
}
const char *getEngineId() const override {
@@ -96,4 +96,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(DRACI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DraciMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DRACI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DraciMetaEngineDetection);
diff --git a/engines/dragons/detection.cpp b/engines/dragons/detection.cpp
index 240dbd0f58..d0385df445 100644
--- a/engines/dragons/detection.cpp
+++ b/engines/dragons/detection.cpp
@@ -123,9 +123,9 @@ static const char * const directoryGlobs[] = {
0
};
-class DragonsMetaEngineStatic : public AdvancedMetaEngineStatic {
+class DragonsMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- DragonsMetaEngineStatic() : AdvancedMetaEngineStatic(Dragons::gameDescriptions, sizeof(Dragons::DragonsGameDescription), dragonsGames) {
+ DragonsMetaEngineDetection() : AdvancedMetaEngineDetection(Dragons::gameDescriptions, sizeof(Dragons::DragonsGameDescription), dragonsGames) {
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
@@ -143,4 +143,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(DRAGONS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DragonsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DRAGONS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DragonsMetaEngineDetection);
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 457d68c2d7..538cd95cd6 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -302,9 +302,9 @@ static const ExtraGuiOption drasculaExtraGuiOption = {
false
};
-class DrasculaMetaEngineStatic : public AdvancedMetaEngineStatic {
+class DrasculaMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- DrasculaMetaEngineStatic() : AdvancedMetaEngineStatic(Drascula::gameDescriptions, sizeof(Drascula::DrasculaGameDescription), drasculaGames) {
+ DrasculaMetaEngineDetection() : AdvancedMetaEngineDetection(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 DrasculaMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions DrasculaMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
options.push_back(drasculaExtraGuiOption);
return options;
@@ -331,4 +331,4 @@ const ExtraGuiOptions DrasculaMetaEngineStatic::getExtraGuiOptions(const Common:
} // End of namespace Drascula
-REGISTER_PLUGIN_STATIC(DRASCULA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Drascula::DrasculaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DRASCULA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Drascula::DrasculaMetaEngineDetection);
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index fa2864c415..6669e37d1a 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 DreamWebMetaEngineStatic : public AdvancedMetaEngineStatic {
+class DreamWebMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- DreamWebMetaEngineStatic():
- AdvancedMetaEngineStatic(DreamWeb::gameDescriptions,
+ DreamWebMetaEngineDetection():
+ AdvancedMetaEngineDetection(DreamWeb::gameDescriptions,
sizeof(DreamWeb::DreamWebGameDescription), dreamWebGames,
gameGuiOptions) {
_guiOptions = GUIO1(GUIO_NOMIDI);
@@ -83,4 +83,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(DREAMWEB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DreamWebMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(DREAMWEB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, DreamWebMetaEngineDetection);
diff --git a/engines/engine.cpp b/engines/engine.cpp
index dc8d0046d9..d40e6fe337 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -873,10 +873,10 @@ EnginePlugin *Engine::getMetaEnginePlugin() const {
*/
-MetaEngineStatic &Engine::getMetaEngineStatic() {
+MetaEngineDetection &Engine::getMetaEngineDetection() {
const Plugin *plugin = EngineMan.findPlugin(ConfMan.get("engineid"));
assert(plugin);
- return plugin->get<MetaEngineStatic>();
+ return plugin->get<MetaEngineDetection>();
}
MetaEngine &Engine::getMetaEngine() {
diff --git a/engines/engine.h b/engines/engine.h
index c3c31dae7e..97444c1a2e 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -31,7 +31,7 @@
#include "common/singleton.h"
class OSystem;
-class MetaEngineStatic;
+class MetaEngineDetection;
class MetaEngine;
namespace Audio {
@@ -387,7 +387,7 @@ public:
*/
static bool shouldQuit();
- static MetaEngineStatic &getMetaEngineStatic();
+ static MetaEngineDetection &getMetaEngineDetection();
static MetaEngine &getMetaEngine();
/**
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index 8679a08a11..7fafcd35d3 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 GlkMetaEngineStatic::getSupportedGames() const {
+PlainGameList GlkMetaEngineDetection::getSupportedGames() const {
PlainGameList list;
Glk::Adrift::AdriftMetaEngine::getSupportedGames(list);
Glk::AdvSys::AdvSysMetaEngine::getSupportedGames(list);
@@ -142,7 +142,7 @@ PlainGameList GlkMetaEngineStatic::getSupportedGames() const {
Glk::GameDescriptor gd##SUBENGINE = Glk::SUBENGINE::SUBENGINE##MetaEngine::findGame(gameId); \
if (gd##SUBENGINE._description) return gd##SUBENGINE
-PlainGameDescriptor GlkMetaEngineStatic::findGame(const char *gameId) const {
+PlainGameDescriptor GlkMetaEngineDetection::findGame(const char *gameId) const {
FIND_GAME(Adrift);
FIND_GAME(AdvSys);
FIND_GAME(Alan2);
@@ -167,7 +167,7 @@ PlainGameDescriptor GlkMetaEngineStatic::findGame(const char *gameId) const {
#undef FIND_GAME
-DetectedGames GlkMetaEngineStatic::detectGames(const Common::FSList &fslist) const {
+DetectedGames GlkMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
#ifndef RELEASE_BUILD
// This is as good a place as any to detect multiple sub-engines using the same Ids
detectClashes();
@@ -196,7 +196,7 @@ DetectedGames GlkMetaEngineStatic::detectGames(const Common::FSList &fslist) con
return detectedGames;
}
-void GlkMetaEngineStatic::detectClashes() const {
+void GlkMetaEngineDetection::detectClashes() const {
Common::StringMap map;
Glk::Adrift::AdriftMetaEngine::detectClashes(map);
Glk::AdvSys::AdvSysMetaEngine::detectClashes(map);
@@ -218,7 +218,7 @@ void GlkMetaEngineStatic::detectClashes() const {
#endif
}
-const ExtraGuiOptions GlkMetaEngineStatic::getExtraGuiOptions(const Common::String &) const {
+const ExtraGuiOptions GlkMetaEngineDetection::getExtraGuiOptions(const Common::String &) const {
ExtraGuiOptions options;
#if defined(USE_TTS)
static const ExtraGuiOption ttsSpeakOptions = {
@@ -239,4 +239,4 @@ const ExtraGuiOptions GlkMetaEngineStatic::getExtraGuiOptions(const Common::Stri
return options;
}
-REGISTER_PLUGIN_STATIC(GLK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GlkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GLK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GlkMetaEngineDetection);
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index 30cd50db8d..8bd415ed27 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -29,9 +29,9 @@
/**
* ScummVM Meta Engine interface
*/
-class GlkMetaEngineStatic : public MetaEngineStatic {
+class GlkMetaEngineDetection : public MetaEngineDetection {
public:
- GlkMetaEngineStatic() : MetaEngineStatic() {}
+ GlkMetaEngineDetection() : MetaEngineDetection() {}
const char *getName() const override {
return "Glk";
diff --git a/engines/glk/metaengine.cpp b/engines/glk/metaengine.cpp
index ea9227cfff..9017e224dd 100644
--- a/engines/glk/metaengine.cpp
+++ b/engines/glk/metaengine.cpp
@@ -145,7 +145,7 @@ Common::String GlkMetaEngine::findFileByGameId(const Common::String &gameId) con
folder.getChildren(fslist, Common::FSNode::kListFilesOnly);
// Get the matching MetaEngine for this Engine.
- const MetaEngineStatic &metaEngine = g_engine->getMetaEngineStatic();
+ const MetaEngineDetection &metaEngine = g_engine->getMetaEngineDetection();
// Iterate over the files
for (Common::FSList::iterator i = fslist.begin(); i != fslist.end(); ++i) {
diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp
index e5505ab9b8..ac5a85891d 100644
--- a/engines/gnap/detection.cpp
+++ b/engines/gnap/detection.cpp
@@ -83,9 +83,9 @@ static const ADGameDescription gameDescriptions[] = {
} // End of namespace Gnap
-class GnapMetaEngineStatic : public AdvancedMetaEngineStatic {
+class GnapMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- GnapMetaEngineStatic() : AdvancedMetaEngineStatic(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) {
+ GnapMetaEngineDetection() : AdvancedMetaEngineDetection(Gnap::gameDescriptions, sizeof(ADGameDescription), gnapGames) {
_maxScanDepth = 3;
}
@@ -102,4 +102,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(GNAP_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GnapMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GNAP_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GnapMetaEngineDetection);
diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp
index 303c0d7a9e..c74cce591e 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 GobMetaEngineStatic : public AdvancedMetaEngineStatic {
+class GobMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- GobMetaEngineStatic();
+ GobMetaEngineDetection();
const char *getEngineId() const override {
return "gob";
@@ -47,13 +47,13 @@ private:
static const Gob::GOBGameDescription *detectOnceUponATime(const Common::FSList &fslist);
};
-GobMetaEngineStatic::GobMetaEngineStatic() :
- AdvancedMetaEngineStatic(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) {
+GobMetaEngineDetection::GobMetaEngineDetection() :
+ AdvancedMetaEngineDetection(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) {
_guiOptions = GUIO1(GUIO_NOLAUNCHLOAD);
}
-ADDetectedGame GobMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame GobMetaEngineDetection::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 GobMetaEngineStatic::fallbackDetect(const FileMap &allFiles, cons
return detectedGame;
}
-const Gob::GOBGameDescription *GobMetaEngineStatic::detectOnceUponATime(const Common::FSList &fslist) {
+const Gob::GOBGameDescription *GobMetaEngineDetection::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 *GobMetaEngineStatic::detectOnceUponATime(const Co
SearchMan.clear();
if ((gameType == Gob::kOnceUponATimeInvalid) || (platform == Gob::kOnceUponATimePlatformInvalid)) {
- warning("GobMetaEngineStatic::detectOnceUponATime(): Detection failed (%d, %d)",
+ warning("GobMetaEngineDetection::detectOnceUponATime(): Detection failed (%d, %d)",
(int)gameType, (int)platform);
return 0;
}
@@ -148,12 +148,12 @@ const Gob::GOBGameDescription *GobMetaEngineStatic::detectOnceUponATime(const Co
return &Gob::fallbackOnceUpon[gameType][platform];
}
-const char *GobMetaEngineStatic::getName() const {
+const char *GobMetaEngineDetection::getName() const {
return "Gob";
}
-const char *GobMetaEngineStatic::getOriginalCopyright() const {
+const char *GobMetaEngineDetection::getOriginalCopyright() const {
return "Goblins Games (C) Coktel Vision";
}
-REGISTER_PLUGIN_STATIC(GOB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GobMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GOB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GobMetaEngineDetection);
diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index 5ac329943f..8e326e1e76 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -46,9 +46,9 @@ static const ADGameDescription gameDescriptions[] = {
}
-class GriffonMetaEngineStatic: public AdvancedMetaEngineStatic {
+class GriffonMetaEngineDetection: public AdvancedMetaEngineDetection {
public:
- GriffonMetaEngineStatic() : AdvancedMetaEngineStatic(Griffon::gameDescriptions, sizeof(ADGameDescription), griffonGames) {
+ GriffonMetaEngineDetection() : AdvancedMetaEngineDetection(Griffon::gameDescriptions, sizeof(ADGameDescription), griffonGames) {
}
const char *getEngineId() const override {
@@ -64,4 +64,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(GRIFFON_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GriffonMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GRIFFON_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, GriffonMetaEngineDetection);
diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp
index 7bffe5bb32..2d31a1bb7c 100644
--- a/engines/grim/detection.cpp
+++ b/engines/grim/detection.cpp
@@ -586,9 +586,9 @@ static const GrimGameDescription gameDescriptions[] = {
{ AD_TABLE_END_MARKER, GType_GRIM }
};
-class GrimMetaEngineStatic : public AdvancedMetaEngineStatic {
+class GrimMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- GrimMetaEngineStatic() : AdvancedMetaEngineStatic(Grim::gameDescriptions, sizeof(Grim::GrimGameDescription), grimGames, gameGuiOptions) {
+ GrimMetaEngineDetection() : AdvancedMetaEngineDetection(Grim::gameDescriptions, sizeof(Grim::GrimGameDescription), grimGames, gameGuiOptions) {
_guiOptions = GUIO_NOMIDI;
}
@@ -613,4 +613,4 @@ public:
} // End of namespace Grim
-REGISTER_PLUGIN_STATIC(GRIM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Grim::GrimMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GRIM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Grim::GrimMetaEngineDetection);
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index b39073c82a..b67ab542d5 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 GroovieMetaEngineStatic : public AdvancedMetaEngineStatic {
+class GroovieMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- GroovieMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(GroovieGameDescription), groovieGames, optionsList) {
+ GroovieMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, Groovie::GroovieMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(GROOVIE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Groovie::GroovieMetaEngineDetection);
diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp
index 6f809a53dd..0c6f6dade8 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 HDBMetaEngineStatic : public AdvancedMetaEngineStatic {
+class HDBMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- HDBMetaEngineStatic() : AdvancedMetaEngineStatic(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) {
+ HDBMetaEngineDetection() : AdvancedMetaEngineDetection(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) {
}
const char *getEngineId() const override {
@@ -149,4 +149,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(HDB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, HDBMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(HDB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, HDBMetaEngineDetection);
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 964752b8ad..ffaa5b0d38 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -63,9 +63,9 @@ const static char *directoryGlobs[] = {
0
};
-class HopkinsMetaEngineStatic : public AdvancedMetaEngineStatic {
+class HopkinsMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- HopkinsMetaEngineStatic() : AdvancedMetaEngineStatic(Hopkins::gameDescriptions, sizeof(Hopkins::HopkinsGameDescription), hopkinsGames, optionsList) {
+ HopkinsMetaEngineDetection() : AdvancedMetaEngineDetection(Hopkins::gameDescriptions, sizeof(Hopkins::HopkinsGameDescription), hopkinsGames, optionsList) {
_maxScanDepth = 3;
_directoryGlobs = directoryGlobs;
}
@@ -84,4 +84,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(HOPKINS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, HopkinsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(HOPKINS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, HopkinsMetaEngineDetection);
diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index 28e16428ac..fddc3636d0 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 HugoMetaEngineStatic : public AdvancedMetaEngineStatic {
+class HugoMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- HugoMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(HugoGameDescription), hugoGames) {
+ HugoMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, Hugo::HugoMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(HUGO_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Hugo::HugoMetaEngineDetection);
diff --git a/engines/icb/detection.cpp b/engines/icb/detection.cpp
index af72169911..f23ba0a543 100644
--- a/engines/icb/detection.cpp
+++ b/engines/icb/detection.cpp
@@ -63,9 +63,9 @@ static const ADGameDescription gameDescriptions[] = {
AD_TABLE_END_MARKER
};
-class IcbMetaEngineStatic : public AdvancedMetaEngineStatic {
+class IcbMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- IcbMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(ADGameDescription), icbGames) {
+ IcbMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(ADGameDescription), icbGames) {
_guiOptions = GUIO_NOMIDI;
_maxScanDepth = 3;
_directoryGlobs = directoryGlobs;
@@ -82,4 +82,4 @@ public:
} // End of namespace ICB
-REGISTER_PLUGIN_STATIC(ICB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ICB::IcbMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ICB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ICB::IcbMetaEngineDetection);
diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index a1b2f2963a..67d74e4389 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -110,9 +110,9 @@ static const char * const directoryGlobs[] = {
0
};
-class IllusionsMetaEngineStatic : public AdvancedMetaEngineStatic {
+class IllusionsMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- IllusionsMetaEngineStatic() : AdvancedMetaEngineStatic(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) {
+ IllusionsMetaEngineDetection() : AdvancedMetaEngineDetection(Illusions::gameDescriptions, sizeof(Illusions::IllusionsGameDescription), illusionsGames) {
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
@@ -130,4 +130,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(ILLUSIONS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, IllusionsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ILLUSIONS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, IllusionsMetaEngineDetection);
diff --git a/engines/kingdom/detection.cpp b/engines/kingdom/detection.cpp
index d5ea36d067..0c98033aa5 100644
--- a/engines/kingdom/detection.cpp
+++ b/engines/kingdom/detection.cpp
@@ -72,9 +72,9 @@ static const ADGameDescription gameDescriptions[] = {
} // End of namespace Kingdom
-class KingdomMetaEngineStatic : public AdvancedMetaEngineStatic {
+class KingdomMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- KingdomMetaEngineStatic() : AdvancedMetaEngineStatic(Kingdom::gameDescriptions, sizeof(ADGameDescription), kingdomGames) {
+ KingdomMetaEngineDetection() : AdvancedMetaEngineDetection(Kingdom::gameDescriptions, sizeof(ADGameDescription), kingdomGames) {
}
const char *getEngineId() const override {
@@ -90,4 +90,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(KINGDOM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, KingdomMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(KINGDOM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, KingdomMetaEngineDetection);
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 0f7a8f580a..3e9d1674e5 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -144,9 +144,9 @@ const ADExtraGuiOptionsMap gameGuiOptions[] = {
} // End of anonymous namespace
-class KyraMetaEngineStatic : public AdvancedMetaEngineStatic {
+class KyraMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- KyraMetaEngineStatic() : AdvancedMetaEngineStatic(adGameDescs, sizeof(KYRAGameDescription), gameList, gameGuiOptions) {
+ KyraMetaEngineDetection() : AdvancedMetaEngineDetection(adGameDescs, sizeof(KYRAGameDescription), gameList, gameGuiOptions) {
_md5Bytes = 1024 * 1024;
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
@@ -172,4 +172,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(KYRA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, KyraMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(KYRA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, KyraMetaEngineDetection);
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index 1aeadb232f..a75f57405d 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -101,9 +101,9 @@ static const char *const directoryGlobs[] = {
-class LabMetaEngineStatic : public AdvancedMetaEngineStatic {
+class LabMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- LabMetaEngineStatic() : AdvancedMetaEngineStatic(labDescriptions, sizeof(ADGameDescription), lab_setting) {
+ LabMetaEngineDetection() : AdvancedMetaEngineDetection(labDescriptions, sizeof(ADGameDescription), lab_setting) {
_maxScanDepth = 4;
_directoryGlobs = directoryGlobs;
_flags = kADFlagUseExtraAsHint;
@@ -122,4 +122,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(LAB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LabMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LAB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LabMetaEngineDetection);
diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp
index 315f998f5d..d402bebe7b 100644
--- a/engines/lastexpress/detection.cpp
+++ b/engines/lastexpress/detection.cpp
@@ -208,9 +208,9 @@ static const char *const directoryGlobs[] = {
0
};
-class LastExpressMetaEngineStatic : public AdvancedMetaEngineStatic {
+class LastExpressMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- LastExpressMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) {
+ LastExpressMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) {
_guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOSFX);
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
@@ -231,4 +231,4 @@ public:
} // End of namespace LastExpress
-REGISTER_PLUGIN_STATIC(LASTEXPRESS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LastExpress::LastExpressMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LASTEXPRESS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LastExpress::LastExpressMetaEngineDetection);
diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp
index bdb4e4dd44..7a6d614839 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 LilliputMetaEngineStatic : public AdvancedMetaEngineStatic {
+class LilliputMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- LilliputMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(LilliputGameDescription), lilliputGames) {
+ LilliputMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, Lilliput::LilliputMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LILLIPUT_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Lilliput::LilliputMetaEngineDetection);
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index bbc3aadae5..8b1c52395c 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -202,9 +202,9 @@ static const LureGameDescription gameDescriptions[] = {
} // End of namespace Lure
-class LureMetaEngineStatic : public AdvancedMetaEngineStatic {
+class LureMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- LureMetaEngineStatic() : AdvancedMetaEngineStatic(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames
+ LureMetaEngineDetection() : AdvancedMetaEngineDetection(Lure::gameDescriptions, sizeof(Lure::LureGameDescription), lureGames
#ifdef USE_TTS
, optionsList
#endif
@@ -230,4 +230,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(LURE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LureMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(LURE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, LureMetaEngineDetection);
diff --git a/engines/macventure/detection.cpp b/engines/macventure/detection.cpp
index def0b5f785..795cefb9d9 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 MacVentureMetaEngineStatic : public AdvancedMetaEngineStatic {
+class MacVentureMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- MacVentureMetaEngineStatic() : AdvancedMetaEngineStatic(MacVenture::gameDescriptions, sizeof(ADGameDescription), macventureGames) {
+ MacVentureMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, MacVenture::MacVentureMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MACVENTURE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MacVenture::MacVentureMetaEngineDetection);
diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index ed7b4e0a7c..b0e403c178 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 MadeMetaEngineStatic : public AdvancedMetaEngineStatic {
+class MadeMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- MadeMetaEngineStatic() : AdvancedMetaEngineStatic(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames) {
+ MadeMetaEngineDetection() : AdvancedMetaEngineDetection(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 MadeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame MadeMetaEngineDetection::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 MadeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, con
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(MADE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MadeMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MADE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MadeMetaEngineDetection);
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index 0dfc0d6605..c3872dc8a8 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 MADSMetaEngineStatic : public AdvancedMetaEngineStatic {
+class MADSMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- MADSMetaEngineStatic() : AdvancedMetaEngineStatic(MADS::gameDescriptions, sizeof(MADS::MADSGameDescription), MADSGames, optionsList) {
+ MADSMetaEngineDetection() : AdvancedMetaEngineDetection(MADS::gameDescriptions, sizeof(MADS::MADSGameDescription), MADSGames, optionsList) {
_maxScanDepth = 3;
}
@@ -133,4 +133,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(MADS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MADSMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MADS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MADSMetaEngineDetection);
diff --git a/engines/metaengine.cpp b/engines/metaengine.cpp
index 2b1222ae58..8be6bcd962 100644
--- a/engines/metaengine.cpp
+++ b/engines/metaengine.cpp
@@ -334,7 +334,7 @@ SaveStateList MetaEngine::listSaves(const char *target, bool saveMode) const {
return saveList;
}
-void MetaEngineStatic::registerDefaultSettings(const Common::String &) const {
+void MetaEngineDetection::registerDefaultSettings(const Common::String &) const {
// Note that as we don't pass the target to getExtraGuiOptions
// we get all the options, even those not relevant for the current
// game. This is necessary because some engines unconditionally
@@ -345,7 +345,7 @@ void MetaEngineStatic::registerDefaultSettings(const Common::String &) const {
}
}
-GUI::OptionsContainerWidget *MetaEngineStatic::buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {
+GUI::OptionsContainerWidget *MetaEngineDetection::buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {
const ExtraGuiOptions engineOptions = getExtraGuiOptions(target);
if (engineOptions.empty()) {
return nullptr;
diff --git a/engines/metaengine.h b/engines/metaengine.h
index 95628c1e9e..f669c13771 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -96,15 +96,15 @@ struct ExtendedSavegameHeader {
/**
* A meta engine static is essentially a factory for Engine instances with the
* added ability of listing and detecting supported games.
- * Every engine "plugin" provides a hook to get an instance of a MetaEngineStatic
- * subclass for that "engine plugin". E.g. SCUMM povides ScummMetaEngineStatic.
+ * Every engine "plugin" provides a hook to get an instance of a MetaEngineDetection
+ * subclass for that "engine plugin". E.g. SCUMM povides ScummMetaEngineDetection.
* This is then in turn used by the frontend code to detect games,
* and other useful functionality. To instantiate actual Engine objects,
* See the class MetaEngine below.
*/
-class MetaEngineStatic : public PluginObject {
+class MetaEngineDetection : public PluginObject {
public:
- virtual ~MetaEngineStatic() {}
+ virtual ~MetaEngineDetection() {}
/** Get the engine ID */
virtual const char *getEngineId() const = 0;
diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index cd36cc3d68..dfa0ff247d 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -76,9 +76,9 @@ static const char *directoryGlobs[] = {
nullptr
};
-class MohawkMetaEngineStatic : public AdvancedMetaEngineStatic {
+class MohawkMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- MohawkMetaEngineStatic() : AdvancedMetaEngineStatic(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) {
+ MohawkMetaEngineDetection() : AdvancedMetaEngineDetection(Mohawk::gameDescriptions, sizeof(Mohawk::MohawkGameDescription), mohawkGames) {
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
@@ -104,8 +104,8 @@ public:
void registerDefaultSettings(const Common::String &target) const override;
};
-DetectedGame MohawkMetaEngineStatic::toDetectedGame(const ADDetectedGame &adGame) const {
- DetectedGame game = AdvancedMetaEngineStatic::toDetectedGame(adGame);
+DetectedGame MohawkMetaEngineDetection::toDetectedGame(const ADDetectedGame &adGame) const {
+ DetectedGame game = AdvancedMetaEngineDetection::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 MohawkMetaEngineStatic::toDetectedGame(const ADDetectedGame &adGame
return game;
}
-void MohawkMetaEngineStatic::registerDefaultSettings(const Common::String &target) const {
+void MohawkMetaEngineDetection::registerDefaultSettings(const Common::String &target) const {
Common::String gameId = ConfMan.get("gameid", target);
if (gameId == "myst" || gameId == "makingofmyst") {
@@ -143,7 +143,7 @@ void MohawkMetaEngineStatic::registerDefaultSettings(const Common::String &targe
return Mohawk::MohawkMetaEngine_Riven::registerDefaultSettings();
}
- return AdvancedMetaEngineStatic::registerDefaultSettings(target);
+ return AdvancedMetaEngineDetection::registerDefaultSettings(target);
}
-REGISTER_PLUGIN_STATIC(MOHAWK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MohawkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MOHAWK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MohawkMetaEngineDetection);
diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp
index c39290484e..86da54f159 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 MortevielleMetaEngineStatic : public AdvancedMetaEngineStatic {
+class MortevielleMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- MortevielleMetaEngineStatic() : AdvancedMetaEngineStatic(Mortevielle::MortevielleGameDescriptions, sizeof(Mortevielle::MortevielleGameDescription),
+ MortevielleMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, MortevielleMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MORTEVIELLE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MortevielleMetaEngineDetection);
diff --git a/engines/mutationofjb/detection.cpp b/engines/mutationofjb/detection.cpp
index aa9ae3828b..db16de8603 100644
--- a/engines/mutationofjb/detection.cpp
+++ b/engines/mutationofjb/detection.cpp
@@ -79,9 +79,9 @@ static const char *const mutationofjbDirectoryGlobs[] = {
nullptr
};
-class MutationOfJBMetaEngineStatic : public AdvancedMetaEngineStatic {
+class MutationOfJBMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- MutationOfJBMetaEngineStatic() : AdvancedMetaEngineStatic(mutationofjbDescriptions, sizeof(ADGameDescription), mutationofjbGames) {
+ MutationOfJBMetaEngineDetection() : AdvancedMetaEngineDetection(mutationofjbDescriptions, sizeof(ADGameDescription), mutationofjbGames) {
_maxScanDepth = 2;
_directoryGlobs = mutationofjbDirectoryGlobs;
}
@@ -99,4 +99,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(MUTATIONOFJB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MutationOfJBMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MUTATIONOFJB_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, MutationOfJBMetaEngineDetection);
diff --git a/engines/myst3/detection.cpp b/engines/myst3/detection.cpp
index 2756b664da..9781f6700b 100644
--- a/engines/myst3/detection.cpp
+++ b/engines/myst3/detection.cpp
@@ -189,9 +189,9 @@ static const ADExtraGuiOptionsMap optionsList[] = {
AD_EXTRA_GUI_OPTIONS_TERMINATOR
};
-class Myst3MetaEngineStatic : public AdvancedMetaEngineStatic {
+class Myst3MetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- Myst3MetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(Myst3GameDescription), myst3Games, optionsList) {
+ Myst3MetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(Myst3GameDescription), myst3Games, optionsList) {
_guiOptions = GUIO5(GUIO_NOMIDI, GUIO_NOSFX, GUIO_NOSPEECH, GUIO_NOSUBTITLES, GAMEOPTION_WIDESCREEN_MOD);
_maxScanDepth = 3;
_directoryGlobs = directoryGlobs;
@@ -212,4 +212,4 @@ public:
} // End of namespace Myst3
-REGISTER_PLUGIN_STATIC(MYST3_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Myst3::Myst3MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(MYST3_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Myst3::Myst3MetaEngineDetection);
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 236034a0da..2ff65ae65f 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -130,9 +130,9 @@ static const ExtraGuiOption neverhoodExtraGuiOption3 = {
};
-class NeverhoodMetaEngineStatic : public AdvancedMetaEngineStatic {
+class NeverhoodMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- NeverhoodMetaEngineStatic() : AdvancedMetaEngineStatic(Neverhood::gameDescriptions, sizeof(ADGameDescription), neverhoodGames) {
+ NeverhoodMetaEngineDetection() : AdvancedMetaEngineDetection(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 NeverhoodMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions NeverhoodMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
options.push_back(neverhoodExtraGuiOption1);
options.push_back(neverhoodExtraGuiOption2);
@@ -159,4 +159,4 @@ const ExtraGuiOptions NeverhoodMetaEngineStatic::getExtraGuiOptions(const Common
return options;
}
-REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, NeverhoodMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, NeverhoodMetaEngineDetection);
diff --git a/engines/ngi/detection.cpp b/engines/ngi/detection.cpp
index f546e6d7a7..36ccf9d77f 100644
--- a/engines/ngi/detection.cpp
+++ b/engines/ngi/detection.cpp
@@ -141,9 +141,9 @@ static const NGIGameDescription gameDescriptions[] = {
} // End of namespace NGI
-class NGIMetaEngineStatic : public AdvancedMetaEngineStatic {
+class NGIMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- NGIMetaEngineStatic() : AdvancedMetaEngineStatic(NGI::gameDescriptions, sizeof(NGI::NGIGameDescription), ngiGames) {
+ NGIMetaEngineDetection() : AdvancedMetaEngineDetection(NGI::gameDescriptions, sizeof(NGI::NGIGameDescription), ngiGames) {
}
const char *getEngineId() const override {
@@ -159,4 +159,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, NGIMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(NGI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, NGIMetaEngineDetection);
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 5be33c34eb..5a36fa2be3 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -201,9 +201,9 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
}
-class ParallactionMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ParallactionMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ParallactionMetaEngineStatic() : AdvancedMetaEngineStatic(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) {
+ ParallactionMetaEngineDetection() : AdvancedMetaEngineDetection(Parallaction::gameDescriptions, sizeof(Parallaction::PARALLACTIONGameDescription), parallactionGames) {
_guiOptions = GUIO1(GUIO_NOLAUNCHLOAD);
}
@@ -220,4 +220,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PARALLACTION_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ParallactionMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PARALLACTION_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ParallactionMetaEngineDetection);
diff --git a/engines/pegasus/detection.cpp b/engines/pegasus/detection.cpp
index 0220c77175..aeb7f425ad 100644
--- a/engines/pegasus/detection.cpp
+++ b/engines/pegasus/detection.cpp
@@ -91,9 +91,9 @@ static const PegasusGameDescription gameDescriptions[] = {
} // End of namespace Pegasus
-class PegasusMetaEngineStatic : public AdvancedMetaEngineStatic {
+class PegasusMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- PegasusMetaEngineStatic() : AdvancedMetaEngineStatic(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) {
+ PegasusMetaEngineDetection() : AdvancedMetaEngineDetection(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) {
}
const char *getEngineId() const override {
@@ -109,4 +109,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PEGASUS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PegasusMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PEGASUS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PegasusMetaEngineDetection);
diff --git a/engines/petka/detection.cpp b/engines/petka/detection.cpp
index 98a5269d7e..5793ec25db 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 PetkaMetaEngineStatic : public AdvancedMetaEngineStatic {
+class PetkaMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- PetkaMetaEngineStatic() : AdvancedMetaEngineStatic(Petka::gameDescriptions, sizeof(ADGameDescription), petkaGames) {
+ PetkaMetaEngineDetection() : AdvancedMetaEngineDetection(Petka::gameDescriptions, sizeof(ADGameDescription), petkaGames) {
_gameIds = petkaGames;
_maxScanDepth = 2;
}
@@ -53,4 +53,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PETKA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PetkaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PETKA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PetkaMetaEngineDetection);
diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp
index b7cf2794a2..5fc66f7ef0 100644
--- a/engines/pink/detection.cpp
+++ b/engines/pink/detection.cpp
@@ -38,9 +38,9 @@ static const char *directoryGlobs[] = {
};
-class PinkMetaEngineStatic : public AdvancedMetaEngineStatic {
+class PinkMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- PinkMetaEngineStatic() : AdvancedMetaEngineStatic(Pink::gameDescriptions, sizeof(ADGameDescription), pinkGames) {
+ PinkMetaEngineDetection() : AdvancedMetaEngineDetection(Pink::gameDescriptions, sizeof(ADGameDescription), pinkGames) {
_gameIds = pinkGames;
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
@@ -59,4 +59,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PINK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PinkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PINK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PinkMetaEngineDetection);
diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp
index 4993753c99..101a3cba41 100644
--- a/engines/plumbers/detection.cpp
+++ b/engines/plumbers/detection.cpp
@@ -62,9 +62,9 @@ static const ADGameDescription gameDescriptions[] = {
} // End of namespace Plumbers
-class PlumbersMetaEngineStatic : public AdvancedMetaEngineStatic {
+class PlumbersMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- PlumbersMetaEngineStatic() : AdvancedMetaEngineStatic(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) {
+ PlumbersMetaEngineDetection() : AdvancedMetaEngineDetection(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) {
}
const char *getEngineId() const override {
@@ -80,4 +80,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PLUMBERS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PlumbersMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PLUMBERS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PlumbersMetaEngineDetection);
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index d281fba87c..a2866a41a5 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -121,9 +121,9 @@ const static char *directoryGlobs[] = {
0
};
-class PrinceMetaEngineStatic : public AdvancedMetaEngineStatic {
+class PrinceMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- PrinceMetaEngineStatic() : AdvancedMetaEngineStatic(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) {
+ PrinceMetaEngineDetection() : AdvancedMetaEngineDetection(Prince::gameDescriptions, sizeof(Prince::PrinceGameDescription), princeGames) {
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
}
@@ -141,4 +141,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(PRINCE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PrinceMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(PRINCE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, PrinceMetaEngineDetection);
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index ee3ce2785c..49dbfa9ec5 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -468,9 +468,9 @@ static const QueenGameDescription gameDescriptions[] = {
} // End of namespace Queen
-class QueenMetaEngineStatic : public AdvancedMetaEngineStatic {
+class QueenMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- QueenMetaEngineStatic() : AdvancedMetaEngineStatic(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) {
+ QueenMetaEngineDetection() : AdvancedMetaEngineDetection(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 QueenMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame QueenMetaEngineDetection::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 QueenMetaEngineStatic::fallbackDetect(const FileMap &allFiles, co
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(QUEEN_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, QueenMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(QUEEN_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, QueenMetaEngineDetection);
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index 40a8a6e372..7de643bbbf 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 SagaMetaEngineStatic : public AdvancedMetaEngineStatic {
+class SagaMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- SagaMetaEngineStatic() : AdvancedMetaEngineStatic(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) {
+ SagaMetaEngineDetection() : AdvancedMetaEngineDetection(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) {
}
const char *getEngineId() const override {
@@ -73,4 +73,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(SAGA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SagaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SAGA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SagaMetaEngineDetection);
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 389fb61f85..b3e651f59f 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -403,9 +403,9 @@ bool OptionsWidget::save() {
return true;
}
-class SciMetaEngineStatic : public AdvancedMetaEngineStatic {
+class SciMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- SciMetaEngineStatic() : AdvancedMetaEngineStatic(Sci::SciGameDescriptions, sizeof(ADGameDescription), s_sciGameTitles, optionsList) {
+ SciMetaEngineDetection() : AdvancedMetaEngineDetection(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 SciMetaEngineStatic::registerDefaultSettings(const Common::String &target) const {
- AdvancedMetaEngineStatic::registerDefaultSettings(target);
+void SciMetaEngineDetection::registerDefaultSettings(const Common::String &target) const {
+ AdvancedMetaEngineDetection::registerDefaultSettings(target);
for (const PopUpOptionsMap *entry = popUpOptionsList; entry->guioFlag; ++entry)
ConfMan.registerDefault(entry->configOption, entry->defaultState);
}
-GUI::OptionsContainerWidget *SciMetaEngineStatic::buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {
+GUI::OptionsContainerWidget *SciMetaEngineDetection::buildEngineOptionsWidgetStatic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const {
return new OptionsWidget(boss, name, target);
}
-ADDetectedGame SciMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame SciMetaEngineDetection::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.
@@ -478,4 +478,4 @@ ADDetectedGame SciMetaEngineStatic::fallbackDetect(const FileMap &allFiles, cons
} // End of namespace Sci
-REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sci::SciMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SCI_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sci::SciMetaEngineDetection);
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 4805bb8d9a..552df4f4c9 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -54,7 +54,7 @@
using namespace Scumm;
-class ScummMetaEngineStatic : public MetaEngineStatic {
+class ScummMetaEngineDetection : public MetaEngineDetection {
public:
const char *getEngineId() const override {
return "scumm";
@@ -70,11 +70,11 @@ public:
const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
};
-PlainGameList ScummMetaEngineStatic::getSupportedGames() const {
+PlainGameList ScummMetaEngineDetection::getSupportedGames() const {
return PlainGameList(gameDescriptions);
}
-PlainGameDescriptor ScummMetaEngineStatic::findGame(const char *gameid) const {
+PlainGameDescriptor ScummMetaEngineDetection::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 ScummMetaEngineStatic::detectGames(const Common::FSList &fslist) const {
+DetectedGames ScummMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames detectedGames;
Common::List<DetectorResult> results;
::detectGames(fslist, results, 0);
@@ -129,7 +129,7 @@ DetectedGames ScummMetaEngineStatic::detectGames(const Common::FSList &fslist) c
return detectedGames;
}
-const char *ScummMetaEngineStatic::getName() const {
+const char *ScummMetaEngineDetection::getName() const {
return "SCUMM ["
#if defined(ENABLE_SCUMM_7_8) && defined(ENABLE_HE)
@@ -149,7 +149,7 @@ const char *ScummMetaEngineStatic::getName() const {
"]";
}
-const char *ScummMetaEngineStatic::getOriginalCopyright() const {
+const char *ScummMetaEngineDetection::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 ScummMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions ScummMetaEngineDetection::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 ScummMetaEngineStatic::getExtraGuiOptions(const Common::St
return options;
}
-REGISTER_PLUGIN_STATIC(SCUMM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ScummMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SCUMM_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ScummMetaEngineDetection);
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index e878cc2c1a..f226ed82bc 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 SherlockMetaEngineStatic : public AdvancedMetaEngineStatic {
+class SherlockMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- SherlockMetaEngineStatic() : AdvancedMetaEngineStatic(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription),
+ SherlockMetaEngineDetection() : AdvancedMetaEngineDetection(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription),
sherlockGames, optionsList) {}
const char *getEngineId() const override {
@@ -140,4 +140,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(SHERLOCK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SherlockMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SHERLOCK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SherlockMetaEngineDetection);
diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp
index 990bca7a50..90f06a2e86 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 SkyMetaEngineStatic : public MetaEngineStatic {
+class SkyMetaEngineDetection : public MetaEngineDetection {
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 *SkyMetaEngineStatic::getName() const {
+const char *SkyMetaEngineDetection::getName() const {
return "Beneath a Steel Sky";
}
-const char *SkyMetaEngineStatic::getOriginalCopyright() const {
+const char *SkyMetaEngineDetection::getOriginalCopyright() const {
return "Beneath a Steel Sky (C) Revolution";
}
-PlainGameList SkyMetaEngineStatic::getSupportedGames() const {
+PlainGameList SkyMetaEngineDetection::getSupportedGames() const {
PlainGameList games;
games.push_back(skySetting);
return games;
}
-const ExtraGuiOptions SkyMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions SkyMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
Common::String guiOptions;
ExtraGuiOptions options;
@@ -113,13 +113,13 @@ const ExtraGuiOptions SkyMetaEngineStatic::getExtraGuiOptions(const Common::Stri
return options;
}
-PlainGameDescriptor SkyMetaEngineStatic::findGame(const char *gameid) const {
+PlainGameDescriptor SkyMetaEngineDetection::findGame(const char *gameid) const {
if (0 == scumm_stricmp(gameid, skySetting.gameId))
return skySetting;
return PlainGameDescriptor::empty();
}
-DetectedGames SkyMetaEngineStatic::detectGames(const Common::FSList &fslist) const {
+DetectedGames SkyMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
DetectedGames detectedGames;
bool hasSkyDsk = false;
bool hasSkyDnr = false;
@@ -175,4 +175,4 @@ DetectedGames SkyMetaEngineStatic::detectGames(const Common::FSList &fslist) con
return detectedGames;
}
-REGISTER_PLUGIN_STATIC(SKY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SkyMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SKY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SkyMetaEngineDetection);
diff --git a/engines/sludge/detection.cpp b/engines/sludge/detection.cpp
index 5d6244fb8c..db2832a605 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 SludgeMetaEngineStatic : public AdvancedMetaEngineStatic {
+class SludgeMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- SludgeMetaEngineStatic() : AdvancedMetaEngineStatic(Sludge::gameDescriptions, sizeof(Sludge::SludgeGameDescription), sludgeGames) {
+ SludgeMetaEngineDetection() : AdvancedMetaEngineDetection(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 SludgeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ADDetectedGame SludgeMetaEngineDetection::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 SludgeMetaEngineStatic::fallbackDetect(const FileMap &allFiles, c
return ADDetectedGame();
}
-REGISTER_PLUGIN_STATIC(SLUDGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SludgeMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SLUDGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SludgeMetaEngineDetection);
diff --git a/engines/stark/detection.cpp b/engines/stark/detection.cpp
index f4aca81ee4..2bfa0392e3 100644
--- a/engines/stark/detection.cpp
+++ b/engines/stark/detection.cpp
@@ -365,9 +365,9 @@ static const ADExtraGuiOptionsMap optionsList[] = {
AD_EXTRA_GUI_OPTIONS_TERMINATOR
};
-class StarkMetaEngineStatic : public AdvancedMetaEngineStatic {
+class StarkMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- StarkMetaEngineStatic() : AdvancedMetaEngineStatic(gameDescriptions, sizeof(ADGameDescription), starkGames, optionsList) {
+ StarkMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(ADGameDescription), starkGames, optionsList) {
_guiOptions = GUIO4(GUIO_NOMIDI, GAMEOPTION_ASSETS_MOD, GAMEOPTION_LINEAR_FILTERING, GAMEOPTION_FONT_ANTIALIASING);
}
@@ -386,4 +386,4 @@ public:
} // End of namespace Stark
-REGISTER_PLUGIN_STATIC(STARK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Stark::StarkMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(STARK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Stark::StarkMetaEngineDetection);
diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index a4dff83c3f..5000faa7db 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -287,9 +287,9 @@ static const StarTrekGameDescription gameDescriptions[] = {
} // End of namespace StarTrek
-class StarTrekMetaEngineStatic : public AdvancedMetaEngineStatic {
+class StarTrekMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- StarTrekMetaEngineStatic() : AdvancedMetaEngineStatic(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) {
+ StarTrekMetaEngineDetection() : AdvancedMetaEngineDetection(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) {
}
const char *getEngineId() const override {
@@ -307,4 +307,4 @@ public:
-REGISTER_PLUGIN_STATIC(STARTREK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, StarTrekMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(STARTREK_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, StarTrekMetaEngineDetection);
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp
index 8c24367308..3800f932cd 100644
--- a/engines/supernova/detection.cpp
+++ b/engines/supernova/detection.cpp
@@ -101,9 +101,9 @@ static const ADGameDescription gameDescriptions[] = {
};
}
-class SupernovaMetaEngineStatic: public AdvancedMetaEngineStatic {
+class SupernovaMetaEngineDetection: public AdvancedMetaEngineDetection {
public:
- SupernovaMetaEngineStatic() : AdvancedMetaEngineStatic(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) {
+ SupernovaMetaEngineDetection() : AdvancedMetaEngineDetection(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) {
}
const char *getEngineId() const override {
@@ -120,4 +120,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(SUPERNOVA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SupernovaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SUPERNOVA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SupernovaMetaEngineDetection);
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 56e6ad1536..3889888397 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 SwordMetaEngineStatic : public MetaEngineStatic {
+class SwordMetaEngineDetection : public MetaEngineDetection {
public:
const char *getEngineId() const override {
return "sword1";
@@ -89,7 +89,7 @@ public:
DetectedGames detectGames(const Common::FSList &fslist) const override;
};
-PlainGameList SwordMetaEngineStatic::getSupportedGames() const {
+PlainGameList SwordMetaEngineDetection::getSupportedGames() const {
PlainGameList games;
games.push_back(sword1FullSettings);
games.push_back(sword1DemoSettings);
@@ -100,7 +100,7 @@ PlainGameList SwordMetaEngineStatic::getSupportedGames() const {
return games;
}
-PlainGameDescriptor SwordMetaEngineStatic::findGame(const char *gameId) const {
+PlainGameDescriptor SwordMetaEngineDetection::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 SwordMetaEngineStatic::detectGames(const Common::FSList &fslist) const {
+DetectedGames SwordMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
int i, j;
DetectedGames detectedGames;
bool filesFound[NUM_FILES_TO_CHECK];
@@ -217,4 +217,4 @@ DetectedGames SwordMetaEngineStatic::detectGames(const Common::FSList &fslist) c
return detectedGames;
}
-REGISTER_PLUGIN_STATIC(SWORD1_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SwordMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SWORD1_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, SwordMetaEngineDetection);
diff --git a/engines/sword2/detection.cpp b/engines/sword2/detection.cpp
index 350e2bd632..a0fb38975b 100644
--- a/engines/sword2/detection.cpp
+++ b/engines/sword2/detection.cpp
@@ -36,7 +36,7 @@ static const ExtraGuiOption sword2ExtraGuiOption = {
false
};
-class Sword2MetaEngineStatic : public MetaEngineStatic {
+class Sword2MetaEngineDetection : public MetaEngineDetection {
public:
const char *getEngineId() const override {
return "sword2";
@@ -55,7 +55,7 @@ public:
DetectedGames detectGames(const Common::FSList &fslist) const override;
};
-PlainGameList Sword2MetaEngineStatic::getSupportedGames() const {
+PlainGameList Sword2MetaEngineDetection::getSupportedGames() const {
const Sword2::GameSettings *g = Sword2::sword2_settings;
PlainGameList games;
while (g->gameid) {
@@ -65,13 +65,13 @@ PlainGameList Sword2MetaEngineStatic::getSupportedGames() const {
return games;
}
-const ExtraGuiOptions Sword2MetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions Sword2MetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
options.push_back(sword2ExtraGuiOption);
return options;
}
-PlainGameDescriptor Sword2MetaEngineStatic::findGame(const char *gameid) const {
+PlainGameDescriptor Sword2MetaEngineDetection::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 Sword2MetaEngineStatic::findGame(const char *gameid) const {
return PlainGameDescriptor::of(g->gameid, g->description);
}
-DetectedGames Sword2MetaEngineStatic::detectGames(const Common::FSList &fslist) const {
+DetectedGames Sword2MetaEngineDetection::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 Sword2MetaEngineStatic::detectGames(const Common::FSList &fslist)
return detectGamesImpl(fslist);
}
-REGISTER_PLUGIN_STATIC(SWORD2_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sword2MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SWORD2_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sword2MetaEngineDetection);
diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp
index 425684ca4b..21c1e6af0e 100644
--- a/engines/sword25/detection.cpp
+++ b/engines/sword25/detection.cpp
@@ -44,9 +44,9 @@ static const ExtraGuiOption sword25ExtraGuiOption = {
false
};
-class Sword25MetaEngineStatic : public AdvancedMetaEngineStatic {
+class Sword25MetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- Sword25MetaEngineStatic() : AdvancedMetaEngineStatic(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) {
+ Sword25MetaEngineDetection() : AdvancedMetaEngineDetection(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 Sword25MetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions Sword25MetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
options.push_back(sword25ExtraGuiOption);
return options;
}
-REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sword25MetaEngineStatic);
+REGISTER_PLUGIN_STATIC(SWORD25_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Sword25MetaEngineDetection);
diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp
index 0a90d48b8f..e4b550722e 100644
--- a/engines/teenagent/detection.cpp
+++ b/engines/teenagent/detection.cpp
@@ -78,9 +78,9 @@ static const ADGameDescription teenAgentGameDescriptions[] = {
-class TeenAgentMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TeenAgentMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TeenAgentMetaEngineStatic() : AdvancedMetaEngineStatic(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) {
+ TeenAgentMetaEngineDetection() : AdvancedMetaEngineDetection(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) {
}
const char *getEngineId() const override {
@@ -96,4 +96,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TEENAGENT_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TeenAgentMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TEENAGENT_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TeenAgentMetaEngineDetection);
diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp
index 25ddb7836f..042c24be06 100644
--- a/engines/testbed/detection.cpp
+++ b/engines/testbed/detection.cpp
@@ -42,9 +42,9 @@ static const ADGameDescription testbedDescriptions[] = {
AD_TABLE_END_MARKER
};
-class TestbedMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TestbedMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TestbedMetaEngineStatic() : AdvancedMetaEngineStatic(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) {
+ TestbedMetaEngineDetection() : AdvancedMetaEngineDetection(testbedDescriptions, sizeof(ADGameDescription), testbed_setting) {
_md5Bytes = 512;
}
@@ -61,4 +61,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TESTBED_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TestbedMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TESTBED_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TestbedMetaEngineDetection);
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index d075f26327..f002fc9864 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 TinselMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TinselMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TinselMetaEngineStatic() : AdvancedMetaEngineStatic(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) {
+ TinselMetaEngineDetection() : AdvancedMetaEngineDetection(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) {
}
const char *getEngineId() const override{
@@ -68,7 +68,7 @@ typedef Common::Array<const ADGameDescription *> 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 TinselMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const {
+ADDetectedGame TinselMetaEngineDetection::fallbackDetect(const FileMap &allFilesXXX, const Common::FSList &fslist) const {
Common::String extra;
FileMap allFiles;
SizeMD5Map filesSizeMD5;
@@ -204,4 +204,4 @@ ADDetectedGame TinselMetaEngineStatic::fallbackDetect(const FileMap &allFilesXXX
return matched;
}
-REGISTER_PLUGIN_STATIC(TINSEL_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TinselMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TINSEL_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TinselMetaEngineDetection);
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index b97fcdb188..85b33325a7 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 TitanicMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TitanicMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TitanicMetaEngineStatic() : AdvancedMetaEngineStatic(Titanic::gameDescriptions, sizeof(Titanic::TitanicGameDescription), TitanicGames) {
+ TitanicMetaEngineDetection() : AdvancedMetaEngineDetection(Titanic::gameDescriptions, sizeof(Titanic::TitanicGameDescription), TitanicGames) {
_maxScanDepth = 3;
}
@@ -53,4 +53,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TITANIC_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TitanicMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TITANIC_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TitanicMetaEngineDetection);
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index d2828eea9f..38f74fa9e9 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -216,9 +216,9 @@ static const ExtraGuiOption toltecsExtraGuiOption = {
false
};
-class ToltecsMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ToltecsMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ToltecsMetaEngineStatic() : AdvancedMetaEngineStatic(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) {
+ ToltecsMetaEngineDetection() : AdvancedMetaEngineDetection(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 ToltecsMetaEngineStatic::getExtraGuiOptions(const Common::String &target) const {
+const ExtraGuiOptions ToltecsMetaEngineDetection::getExtraGuiOptions(const Common::String &target) const {
ExtraGuiOptions options;
options.push_back(toltecsExtraGuiOption);
return options;
}
-REGISTER_PLUGIN_STATIC(TOLTECS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToltecsMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TOLTECS_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToltecsMetaEngineDetection);
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 769af73a7e..050fd7078d 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 TonyMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TonyMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TonyMetaEngineStatic() : AdvancedMetaEngineStatic(Tony::gameDescriptions, sizeof(Tony::TonyGameDescription), tonyGames) {
+ TonyMetaEngineDetection() : AdvancedMetaEngineDetection(Tony::gameDescriptions, sizeof(Tony::TonyGameDescription), tonyGames) {
}
const char *getEngineId() const override {
@@ -51,4 +51,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TONY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TonyMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TONY_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TonyMetaEngineDetection);
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index 1d518f49e6..c3a3e6b57a 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -130,9 +130,9 @@ static const char * const directoryGlobs[] = {
0
};
-class ToonMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ToonMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ToonMetaEngineStatic() : AdvancedMetaEngineStatic(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) {
+ ToonMetaEngineDetection() : AdvancedMetaEngineDetection(Toon::gameDescriptions, sizeof(ADGameDescription), toonGames) {
_maxScanDepth = 3;
_directoryGlobs = directoryGlobs;
}
@@ -154,4 +154,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TOON_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToonMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TOON_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToonMetaEngineDetection);
diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 14f77091c9..765df9cba4 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -119,9 +119,9 @@ static const char *directoryGlobs[] = {
0
};
-class ToucheMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ToucheMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ToucheMetaEngineStatic() : AdvancedMetaEngineStatic(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) {
+ ToucheMetaEngineDetection() : AdvancedMetaEngineDetection(Touche::gameDescriptions, sizeof(ADGameDescription), toucheGames) {
_md5Bytes = 4096;
_maxScanDepth = 2;
_directoryGlobs = directoryGlobs;
@@ -144,4 +144,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TOUCHE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToucheMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TOUCHE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ToucheMetaEngineDetection);
diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp
index 57c9eb2dac..ef9b932835 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 TSageMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TSageMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TSageMetaEngineStatic() : AdvancedMetaEngineStatic(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) {
+ TSageMetaEngineDetection() : AdvancedMetaEngineDetection(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) {
}
const char *getEngineId() const override {
@@ -54,4 +54,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(TSAGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TSageMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TSAGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TSageMetaEngineDetection);
diff --git a/engines/tucker/detection.cpp b/engines/tucker/detection.cpp
index 638515bfe9..ac28d72cee 100644
--- a/engines/tucker/detection.cpp
+++ b/engines/tucker/detection.cpp
@@ -116,9 +116,9 @@ static const ADGameDescription tuckerDemoGameDescription = {
GUIO1(GUIO_NOMIDI)
};
-class TuckerMetaEngineStatic : public AdvancedMetaEngineStatic {
+class TuckerMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- TuckerMetaEngineStatic() : AdvancedMetaEngineStatic(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) {
+ TuckerMetaEngineDetection() : AdvancedMetaEngineDetection(tuckerGameDescriptions, sizeof(ADGameDescription), tuckerGames) {
_md5Bytes = 512;
}
@@ -151,4 +151,4 @@ public:
};
-REGISTER_PLUGIN_STATIC(TUCKER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TuckerMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(TUCKER_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TuckerMetaEngineDetection);
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index ce95c9aa96..419797ded3 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"
-UltimaMetaEngineStatic::UltimaMetaEngineStatic() : AdvancedMetaEngineStatic(Ultima::GAME_DESCRIPTIONS,
+UltimaMetaEngineDetection::UltimaMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, UltimaMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ULTIMA_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, UltimaMetaEngineDetection);
diff --git a/engines/ultima/detection.h b/engines/ultima/detection.h
index 52b2eff3e3..97aab31560 100644
--- a/engines/ultima/detection.h
+++ b/engines/ultima/detection.h
@@ -58,10 +58,10 @@ struct UltimaGameDescription {
} // End of namespace Ultima
-class UltimaMetaEngineStatic : public AdvancedMetaEngineStatic {
+class UltimaMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- UltimaMetaEngineStatic();
- ~UltimaMetaEngineStatic() override {}
+ UltimaMetaEngineDetection();
+ ~UltimaMetaEngineDetection() override {}
const char *getEngineId() const override {
return "ultima";
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 3ba72008a6..30011a62cd 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 VoyeurMetaEngineStatic : public AdvancedMetaEngineStatic {
+class VoyeurMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- VoyeurMetaEngineStatic() : AdvancedMetaEngineStatic(Voyeur::gameDescriptions, sizeof(Voyeur::VoyeurGameDescription), voyeurGames) {
+ VoyeurMetaEngineDetection() : AdvancedMetaEngineDetection(Voyeur::gameDescriptions, sizeof(Voyeur::VoyeurGameDescription), voyeurGames) {
_maxScanDepth = 3;
}
@@ -53,4 +53,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(VOYEUR_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, VoyeurMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(VOYEUR_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, VoyeurMetaEngineDetection);
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index f30356be55..5540854a35 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 WageMetaEngineStatic : public AdvancedMetaEngineStatic {
+class WageMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- WageMetaEngineStatic() : AdvancedMetaEngineStatic(Wage::gameDescriptions, sizeof(ADGameDescription), wageGames) {
+ WageMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, WageMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(WAGE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, WageMetaEngineDetection);
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index abfe1256f7..fa363c60e9 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -66,9 +66,9 @@ static const char *directoryGlobs[] = {
0
};
-class WintermuteMetaEngineStatic : public AdvancedMetaEngineStatic {
+class WintermuteMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- WintermuteMetaEngineStatic() : AdvancedMetaEngineStatic(Wintermute::gameDescriptions, sizeof(WMEGameDescription), Wintermute::wintermuteGames, gameGuiOptions) {
+ WintermuteMetaEngineDetection() : AdvancedMetaEngineDetection(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;
@@ -123,4 +123,4 @@ public:
} // End of namespace Wintermute
-REGISTER_PLUGIN_STATIC(WINTERMUTE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Wintermute::WintermuteMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(WINTERMUTE_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Wintermute::WintermuteMetaEngineDetection);
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index dfccf971c2..a129ca2e81 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 XeenMetaEngineStatic : public AdvancedMetaEngineStatic {
+class XeenMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- XeenMetaEngineStatic() : AdvancedMetaEngineStatic(Xeen::gameDescriptions, sizeof(Xeen::XeenGameDescription),
+ XeenMetaEngineDetection() : AdvancedMetaEngineDetection(Xeen::gameDescriptions, sizeof(Xeen::XeenGameDescription),
XeenGames, optionsList) {
_maxScanDepth = 3;
}
@@ -84,4 +84,4 @@ public:
}
};
-REGISTER_PLUGIN_STATIC(XEEN_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, XeenMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(XEEN_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, XeenMetaEngineDetection);
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index aac7c32ad7..255e97d210 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 ZVisionMetaEngineStatic : public AdvancedMetaEngineStatic {
+class ZVisionMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
- ZVisionMetaEngineStatic() : AdvancedMetaEngineStatic(ZVision::gameDescriptions, sizeof(ZVision::ZVisionGameDescription), ZVision::zVisionGames, ZVision::optionsList) {
+ ZVisionMetaEngineDetection() : AdvancedMetaEngineDetection(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_ENGINE_DETECTION, ZVisionMetaEngineStatic);
+REGISTER_PLUGIN_STATIC(ZVISION_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, ZVisionMetaEngineDetection);
diff --git a/gui/about.cpp b/gui/about.cpp
index f63b972ee4..db9c948f8a 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -127,7 +127,7 @@ AboutDialog::AboutDialog()
addLine(str);
str = "C2";
- str += (*iter)->get<MetaEngineStatic>().getOriginalCopyright();
+ str += (*iter)->get<MetaEngineDetection>().getOriginalCopyright();
addLine(str);
//addLine("");
diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp
index 1cc80bf000..74f5e05872 100644
--- a/gui/editgamedialog.cpp
+++ b/gui/editgamedialog.cpp
@@ -185,7 +185,7 @@ EditGameDialog::EditGameDialog(const String &domain)
if (metaEnginePlugin) {
int tabId = tab->addTab(_("Engine"), "GameOptions_Engine");
- const MetaEngineStatic &metaEngine = metaEnginePlugin->get<MetaEngineStatic>();
+ const MetaEngineDetection &metaEngine = metaEnginePlugin->get<MetaEngineDetection>();
metaEngine.registerDefaultSettings(_domain);
_engineOptions = metaEngine.buildEngineOptionsWidgetStatic(tab, "GameOptions_Engine.Container", _domain);
More information about the Scummvm-git-logs
mailing list