thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLUGINS: MetaEngineStatic -> MetaEngineDetection

Browse source
This commit is contained in:
Eugene Sandulenko 2020-10-11 23:14:39 +02:00
parent 7ea6781043
commit 7ff34bc9ec
96 changed files with 351 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/plugins.cpp
View file

@ -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'",