PLUGINS: PLUGIN_TYPE_METAENGINE -> PLUGIN_TYPE_ENGINE_DETECTION

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

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.

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

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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;

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);