libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-03 23:52:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENGINES: Change the MetaEngineDetection interface to match MetaEngine

Browse Source
This commit is contained in:
Cameron Cawley 2022-01-13 20:34:25 +00:00 committed by Eugene Sandulenko
parent 38425bcef9
commit f3b094e53f
103 changed files with 236 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
base/commandLine.cpp
View File

@ -962,10 +962,10 @@ static void listGames(const Common::String &engineID) {
continue;
}
if (all || (p->getEngineId() == engineID)) {
if (all || (p->getName() == engineID)) {
PlainGameList list = p->get<MetaEngineDetection>().getSupportedGames();
for (PlainGameList::const_iterator v = list.begin(); v != list.end(); ++v) {
printf("%-30s %s\n", buildQualifiedGameName(p->get<MetaEngineDetection>().getEngineId(), v->gameId).c_str(), v->description);
printf("%-30s %s\n", buildQualifiedGameName(p->get<MetaEngineDetection>().getName(), v->gameId).c_str(), v->description);
}
}
}
@ -982,10 +982,10 @@ static void listAllGames(const Common::String &engineID) {
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {
const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
if (any || (metaEngine.getEngineId() == engineID)) {
if (any || (metaEngine.getName() == engineID)) {
PlainGameList list = metaEngine.getSupportedGames();
for (PlainGameList::const_iterator v = list.begin(); v != list.end(); ++v) {
printf("%-30s %s\n", buildQualifiedGameName(metaEngine.getEngineId(), v->gameId).c_str(), v->description);
printf("%-30s %s\n", buildQualifiedGameName(metaEngine.getName(), v->gameId).c_str(), v->description);
}
}
}
@ -1004,7 +1004,7 @@ static void listEngines() {
continue;
}
printf("%-15s %s\n", p->get<MetaEngineDetection>().getEngineId(), p->get<MetaEngineDetection>().getName());
printf("%-15s %s\n", p->get<MetaEngineDetection>().getName(), p->get<MetaEngineDetection>().getEngineName());
}
}
@ -1016,7 +1016,7 @@ static void listAllEngines() {
const PluginList &plugins = EngineMan.getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {
const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
printf("%-15s %s\n", metaEngine.getEngineId(), metaEngine.getName());
printf("%-15s %s\n", metaEngine.getName(), metaEngine.getEngineName());
}
}
@ -1070,10 +1070,10 @@ static void listDebugFlags(const Common::String &engineID) {
const PluginList &plugins = EngineMan.getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {
const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
if (metaEngine.getEngineId() == engineID) {
if (metaEngine.getName() == engineID) {
printf("Flag name Flag description \n");
printf("--------------- ------------------------------------------------------\n");
printf("ID=%-12s Name=%s\n", metaEngine.getEngineId(), metaEngine.getName());
printf("ID=%-12s Name=%s\n", metaEngine.getName(), metaEngine.getEngineName());
printDebugFlags(metaEngine.getDebugChannels());
return;
}
@ -1090,7 +1090,7 @@ static void listAllEngineDebugFlags() {
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); ++iter) {
const MetaEngineDetection &metaEngine = (*iter)->get<MetaEngineDetection>();
printf("--------------- ------------------------------------------------------\n");
printf("ID=%-12s Name=%s\n", metaEngine.getEngineId(), metaEngine.getName());
printf("ID=%-12s Name=%s\n", metaEngine.getName(), metaEngine.getEngineName());
printDebugFlags(metaEngine.getDebugChannels());
}
}

4
base/main.cpp
View File

@ -132,8 +132,8 @@ static const Plugin *detectPlugin() {
}
// Query the plugin for the game descriptor
printf(" Looking for a plugin supporting this target... %s\n", plugin->getName());
const MetaEngineDetection &metaEngine = plugin->get<MetaEngineDetection>();
printf(" Looking for a plugin supporting this target... %s\n", metaEngine.getEngineName());
DebugMan.addAllDebugChannels(metaEngine.getDebugChannels());
PlainGameDescriptor game = metaEngine.findGame(gameId.c_str());
if (!game.gameId) {
@ -224,7 +224,7 @@ static Common::Error runGame(const Plugin *plugin, const Plugin *enginePlugin, O
// Print a warning; note that scummvm_main will also
// display an error dialog, so we don't have to do this here.
warning("%s failed to instantiate engine: %s (target '%s', path '%s')",
plugin->getName(),
metaEngineDetection.getEngineName(),
err.getDesc().c_str(),
target.c_str(),
dir.getPath().c_str()

28
base/plugins.cpp
View File

@ -55,14 +55,6 @@ const char *Plugin::getName() const {
return _pluginObject->getName();
}
const char *Plugin::getEngineId() const {
if (_type == PLUGIN_TYPE_ENGINE_DETECTION) {
return get<MetaEngineDetection>().getEngineId();
}
return nullptr;
}
StaticPlugin::StaticPlugin(PluginObject *pluginobject, PluginType type) {
assert(pluginobject);
assert(type < PLUGIN_TYPE_MAX);
@ -297,16 +289,16 @@ const Plugin *PluginManager::getEngineFromMetaEngine(const Plugin *plugin) {
const Plugin *enginePlugin = nullptr;
// Use the engineID from MetaEngine for comparison.
Common::String metaEnginePluginName = plugin->getEngineId();
Common::String metaEnginePluginName = plugin->getName();
enginePlugin = PluginMan.findEnginePlugin(metaEnginePluginName);
if (enginePlugin) {
debug(9, "MetaEngine: %s \t matched to \t Engine: %s", plugin->getName(), enginePlugin->getFileName());
debug(9, "MetaEngine: %s \t matched to \t Engine: %s", plugin->get<MetaEngineDetection>().getEngineName(), enginePlugin->getFileName());
return enginePlugin;
}
debug(9, "MetaEngine: %s couldn't find a match for an engine plugin.", plugin->getName());
debug(9, "MetaEngine: %s couldn't find a match for an engine plugin.", plugin->get<MetaEngineDetection>().getEngineName());
return nullptr;
}
@ -322,7 +314,7 @@ const Plugin *PluginManager::getMetaEngineFromEngine(const Plugin *plugin) {
Common::String enginePluginName(plugin->getName());
for (PluginList::const_iterator itr = pl.begin(); itr != pl.end(); itr++) {
Common::String metaEngineName = (*itr)->getEngineId();
Common::String metaEngineName = (*itr)->getName();
if (metaEngineName.equalsIgnoreCase(enginePluginName)) {
metaEngine = (*itr);
@ -331,7 +323,7 @@ const Plugin *PluginManager::getMetaEngineFromEngine(const Plugin *plugin) {
}
if (metaEngine) {
debug(9, "Engine: %s matched to MetaEngine: %s", plugin->getFileName(), metaEngine->getName());
debug(9, "Engine: %s matched to MetaEngine: %s", plugin->getFileName(), metaEngine->get<MetaEngineDetection>().getEngineName());
return metaEngine;
}
@ -683,7 +675,7 @@ QualifiedGameList EngineManager::findGamesMatching(const Common::String &engineI
PlainGameDescriptor pluginResult = engine.findGame(gameId.c_str());
if (pluginResult.gameId) {
results.push_back(QualifiedGameDescriptor(engine.getEngineId(), pluginResult));
results.push_back(QualifiedGameDescriptor(engine.getName(), pluginResult));
}
}
} else {
@ -713,7 +705,7 @@ QualifiedGameList EngineManager::findGameInLoadedPlugins(const Common::String &g
PlainGameDescriptor pluginResult = engine.findGame(gameId.c_str());
if (pluginResult.gameId) {
results.push_back(QualifiedGameDescriptor(engine.getEngineId(), pluginResult));
results.push_back(QualifiedGameDescriptor(engine.getName(), pluginResult));
}
}
@ -815,7 +807,7 @@ const Plugin *EngineManager::findPlugin(const Common::String &engineId) const {
const PluginList &plugins = getPlugins();
for (PluginList::const_iterator iter = plugins.begin(); iter != plugins.end(); iter++)
if (engineId == (*iter)->get<MetaEngineDetection>().getEngineId())
if (engineId == (*iter)->get<MetaEngineDetection>().getName())
return *iter;
return nullptr;
@ -887,7 +879,7 @@ QualifiedGameDescriptor EngineManager::findTarget(const Common::String &target,
if (plugin)
*plugin = foundPlugin;
return QualifiedGameDescriptor(engine.getEngineId(), desc);
return QualifiedGameDescriptor(engine.getName(), desc);
}
void EngineManager::upgradeTargetIfNecessary(const Common::String &target) const {
@ -951,7 +943,7 @@ void EngineManager::upgradeTargetForEngineId(const Common::String &target) const
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'",
metaEngine.getEngineId(), path.c_str(), target.c_str());
metaEngine.getName(), path.c_str(), target.c_str());
return;
}

1
base/plugins.h
View File

@ -163,7 +163,6 @@ public:
**/
PluginType getType() const;
const char *getName() const;
const char *getEngineId() const;
template <class T>
T &get() const {

4
devtools/create_engine/files/detection.h
View File

@ -47,11 +47,11 @@ public:
XyzzyMetaEngineDetection();
~XyzzyMetaEngineDetection() override {}
const char *getEngineId() const override {
const char *getName() const override {
return "xyzzy";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Xyzzy";
}

4
engines/access/detection.cpp
View File

@ -46,11 +46,11 @@ public:
_maxScanDepth = 3;
}
const char *getEngineId() const override {
const char *getName() const override {
return "access";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Access";
}

4
engines/adl/detection.cpp
View File

@ -472,11 +472,11 @@ class AdlMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
AdlMetaEngineDetection() : AdvancedMetaEngineDetection(gameFileDescriptions, sizeof(AdlGameDescription), adlGames, optionsList) { }
const char *getName() const override {
const char *getEngineName() const override {
return "ADL";
}
const char *getEngineId() const override {
const char *getName() const override {
return "adl";
}

8
engines/advancedDetector.cpp
View File

@ -186,7 +186,7 @@ DetectedGame AdvancedMetaEngineDetection::toDetectedGame(const ADDetectedGame &a
title = extraInfo->gameName.c_str();
}
DetectedGame game(getEngineId(), desc->gameId, title, desc->language, desc->platform, extra, ((desc->flags & (ADGF_UNSUPPORTED | ADGF_WARNING)) != 0));
DetectedGame game(getName(), desc->gameId, title, desc->language, desc->platform, extra, ((desc->flags & (ADGF_UNSUPPORTED | ADGF_WARNING)) != 0));
game.hasUnknownFiles = adGame.hasUnknownFiles;
game.matchedFiles = adGame.matchedFiles;
@ -581,7 +581,7 @@ ADDetectedGames AdvancedMetaEngineDetection::detectGame(const Common::FSNode &pa
const ADGameDescription *g;
const byte *descPtr;
debugC(3, kDebugGlobalDetection, "Starting detection for engine '%s' in dir '%s'", getEngineId(), parent.getPath().c_str());
debugC(3, kDebugGlobalDetection, "Starting detection for engine '%s' in dir '%s'", getName(), parent.getPath().c_str());
preprocessDescriptions();
@ -840,7 +840,7 @@ void AdvancedMetaEngineDetection::preprocessDescriptions() {
if (strchr(fileDesc->fileName, '/')) {
if (!(_flags & kADFlagMatchFullPaths))
warning("Path component detected in entry for '%s' in engine '%s' but no kADFlagMatchFullPaths is set",
g->gameId, getEngineId());
g->gameId, getName());
Common::StringTokenizer tok(fileDesc->fileName, "/");
@ -858,7 +858,7 @@ void AdvancedMetaEngineDetection::preprocessDescriptions() {
// Check if the detection entry have only files from the blacklist
if (isEntryGrayListed(g)) {
debug(0, "WARNING: Detection entry for '%s' in engine '%s' contains only blacklisted names. Add more files to the entry (%s)",
g->gameId, getEngineId(), g->filesDescriptions[0].md5);
g->gameId, getName(), g->filesDescriptions[0].md5);
}
}
}

4
engines/agi/detection.cpp
View File

@ -168,11 +168,11 @@ public:
_flags = kADFlagMatchFullPaths;
}
const char *getEngineId() const override {
const char *getName() const override {
return "agi";
}
const char *getName() const override {
const char *getEngineName() const override {
return "AGI preAGI + v2 + v3";
}

4
engines/agos/detection.cpp
View File

@ -148,11 +148,11 @@ public:
return Engines::findGameID(gameId, _gameIds, obsoleteGameIDsTable);
}
const char *getEngineId() const override {
const char *getName() const override {
return "agos";
}
const char *getName() const override {
const char *getEngineName() const override {
return "AGOS";
}

4
engines/ags/detection.h
View File

@ -70,11 +70,11 @@ public:
AGSMetaEngineDetection();
~AGSMetaEngineDetection() override {}
const char *getEngineId() const override {
const char *getName() const override {
return "ags";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Adventure Game Studio";
}

4
engines/asylum/detection.cpp
View File

@ -55,11 +55,11 @@ public:
return detectGameFilebased(allFiles, Asylum::fileBasedFallback);
}
const char *getEngineId() const override {
const char *getName() const override {
return "asylum";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Sanitarium";
}

4
engines/avalanche/detection.cpp
View File

@ -57,11 +57,11 @@ public:
AvalancheMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(AvalancheGameDescription), avalancheGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "avalanche";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Avalanche";
}

4
engines/bbvs/detection.cpp
View File

@ -99,11 +99,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "bbvs";
}
const char *getName() const override {
const char *getEngineName() const override {
return "MTV's Beavis and Butt-head in Virtual Stupidity";
}

6
engines/bladerunner/detection.cpp
View File

@ -122,8 +122,8 @@ class BladeRunnerMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
BladeRunnerMetaEngineDetection();
const char *getEngineId() const override;
const char *getName() const override;
const char *getEngineName() const override;
const char *getOriginalCopyright() const override;
const DebugChannelDef *getDebugChannels() const override;
};
@ -145,11 +145,11 @@ BladeRunnerMetaEngineDetection::BladeRunnerMetaEngineDetection()
_flags = kADFlagUseExtraAsHint;
}
const char *BladeRunnerMetaEngineDetection::getEngineId() const {
const char *BladeRunnerMetaEngineDetection::getName() const {
return "bladerunner";
}
const char *BladeRunnerMetaEngineDetection::getName() const {
const char *BladeRunnerMetaEngineDetection::getEngineName() const {
return "Blade Runner";
}

4
engines/buried/detection.cpp
View File

@ -75,11 +75,11 @@ public:
_directoryGlobs = Buried::directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "buried";
}
const char *getName() const override {
const char *getEngineName() const override {
return "The Journeyman Project 2: Buried in Time";
}

4
engines/cge/detection.cpp
View File

@ -141,11 +141,11 @@ public:
CGEMetaEngineDetection() : AdvancedMetaEngineDetection(CGE::gameDescriptions, sizeof(ADGameDescription), CGEGames, optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "cge";
}
const char *getName() const override {
const char *getEngineName() const override {
return "CGE";
}

4
engines/cge2/detection.cpp
View File

@ -145,11 +145,11 @@ public:
CGE2MetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(ADGameDescription), CGE2Games, optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "cge2";
}
const char *getName() const override {
const char *getEngineName() const override {
return "CGE2";
}

4
engines/chewy/detection.cpp
View File

@ -129,11 +129,11 @@ public:
_flags = kADFlagMatchFullPaths;
}
const char *getEngineId() const override {
const char *getName() const override {
return "chewy";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Chewy: Esc from F5";
}

4
engines/cine/detection.cpp
View File

@ -77,11 +77,11 @@ public:
_guiOptions = GUIO3(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_TRANSPARENT_DIALOG_BOXES);
}
const char *getEngineId() const override {
const char *getName() const override {
return "cine";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Cinematique evo 1";
}

4
engines/composer/detection.cpp
View File

@ -58,11 +58,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "composer";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Magic Composer";
}

4
engines/cruise/detection.cpp
View File

@ -204,11 +204,11 @@ public:
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
}
const char *getEngineId() const override {
const char *getName() const override {
return "cruise";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Cinematique evo 2";
}

4
engines/cryo/detection.cpp
View File

@ -123,11 +123,11 @@ public:
CryoMetaEngineDetection() : AdvancedMetaEngineDetection(Cryo::gameDescriptions, sizeof(ADGameDescription), cryoGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "cryo";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Cryo";
}

4
engines/cryomni3d/detection.cpp
View File

@ -67,11 +67,11 @@ public:
return detectGameFilebased(allFiles, fileBased);
}
const char *getEngineId() const override {
const char *getName() const override {
return "cryomni3d";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Cryo Omni3D";
}

4
engines/director/detection.cpp
View File

@ -84,11 +84,11 @@ public:
_customTarget[customTargetList[i].name] = true;
}
const char *getEngineId() const override {
const char *getName() const override {
return "director";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Macromedia Director";
}

4
engines/dm/detection.cpp
View File

@ -98,11 +98,11 @@ public:
DMMetaEngineDetection() : AdvancedMetaEngineDetection(DM::gameDescriptions, sizeof(DMADGameDescription), DMGames, optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "dm";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Dungeon Master";
}

4
engines/draci/detection.cpp
View File

@ -95,11 +95,11 @@ public:
DraciMetaEngineDetection() : AdvancedMetaEngineDetection(Draci::gameDescriptions, sizeof(ADGameDescription), draciGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "draci";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Draci Historie";
}

4
engines/dragons/detection.cpp
View File

@ -126,11 +126,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "dragons";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Blazing Dragons";
}

4
engines/drascula/detection.cpp
View File

@ -317,11 +317,11 @@ public:
_guiOptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD);
}
const char *getEngineId() const override {
const char *getName() const override {
return "drascula";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Drascula: The Vampire Strikes Back";
}

4
engines/dreamweb/detection.cpp
View File

@ -110,11 +110,11 @@ public:
_guiOptions = GUIO1(GUIO_NOMIDI);
}
const char *getEngineId() const override {
const char *getName() const override {
return "dreamweb";
}
const char *getName() const override {
const char *getEngineName() const override {
return "DreamWeb";
}

4
engines/glk/detection.h
View File

@ -32,11 +32,11 @@ class GlkMetaEngineDetection : public MetaEngineDetection {
public:
GlkMetaEngineDetection() : MetaEngineDetection() {}
const char *getName() const override {
const char *getEngineName() const override {
return "Glk";
}
const char *getEngineId() const override {
const char *getName() const override {
return "glk";
}

4
engines/gnap/detection.cpp
View File

@ -83,11 +83,11 @@ public:
_maxScanDepth = 3;
}
const char *getEngineId() const override {
const char *getName() const override {
return "gnap";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Gnap";
}

6
engines/gob/detection/detection.cpp
View File

@ -47,11 +47,11 @@ class GobMetaEngineDetection : public AdvancedMetaEngineDetection {
public:
GobMetaEngineDetection();
const char *getEngineId() const override {
const char *getName() const override {
return "gob";
}
const char *getName() const override;
const char *getEngineName() const override;
const char *getOriginalCopyright() const override;
const DebugChannelDef *getDebugChannels() const override {
@ -168,7 +168,7 @@ const Gob::GOBGameDescription *GobMetaEngineDetection::detectOnceUponATime(const
return &Gob::fallbackOnceUpon[gameType][platform];
}
const char *GobMetaEngineDetection::getName() const {
const char *GobMetaEngineDetection::getEngineName() const {
return "Gob";
}

4
engines/griffon/detection.cpp
View File

@ -82,11 +82,11 @@ public:
) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "griffon";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Griffon Engine";
}

4
engines/grim/detection.cpp
View File

@ -641,11 +641,11 @@ public:
return Engines::findGameID(gameid, _gameIds, obsoleteGameIDsTable);
}
const char *getName() const override {
const char *getEngineName() const override {
return "Grim";
}
const char *getEngineId() const override {
const char *getName() const override {
return "grim";
}

4
engines/groovie/detection.cpp
View File

@ -340,11 +340,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "groovie";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Groovie";
}

4
engines/hadesch/detection.cpp
View File

@ -74,11 +74,11 @@ public:
_directoryGlobs = Hadesch::directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "hadesch";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Hades Challenge";
}

4
engines/hdb/detection.cpp
View File

@ -137,11 +137,11 @@ public:
HDBMetaEngineDetection() : AdvancedMetaEngineDetection(HDB::gameDescriptions, sizeof(ADGameDescription), hdbGames, optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "hdb";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Hyperspace Delivery Boy!";
}

4
engines/hopkins/detection.cpp
View File

@ -80,11 +80,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "hopkins";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Hopkins FBI";
}

4
engines/hugo/detection.cpp
View File

@ -132,11 +132,11 @@ public:
HugoMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(HugoGameDescription), hugoGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "hugo";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Hugo";
}

4
engines/hypno/detection.cpp
View File

@ -324,11 +324,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "hypno";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Hypno";
}

4
engines/icb/detection.cpp
View File

@ -83,9 +83,9 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getName() const override { return "In Cold Blood Engine"; }
const char *getEngineName() const override { return "In Cold Blood Engine"; }
const char *getEngineId() const override {
const char *getName() const override {
return "icb";
}

4
engines/illusions/detection.cpp
View File

@ -116,11 +116,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "illusions";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Illusions";
}

4
engines/kingdom/detection.cpp
View File

@ -83,11 +83,11 @@ public:
KingdomMetaEngineDetection() : AdvancedMetaEngineDetection(Kingdom::gameDescriptions, sizeof(ADGameDescription), kingdomGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "kingdom";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Kingdom: The Far Reaches' Engine";
}

4
engines/kyra/detection.cpp
View File

@ -179,11 +179,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "kyra";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Kyra";
}

4
engines/lab/detection.cpp
View File

@ -102,11 +102,11 @@ public:
_flags = kADFlagUseExtraAsHint;
}
const char *getEngineId() const override {
const char *getName() const override {
return "lab";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Labyrinth of Time";
}

4
engines/lastexpress/detection.cpp
View File

@ -229,11 +229,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "lastexpress";
}
const char *getName() const override {
const char *getEngineName() const override {
return "The Last Express";
}

4
engines/lilliput/detection.cpp
View File

@ -119,11 +119,11 @@ public:
LilliputMetaEngineDetection() : AdvancedMetaEngineDetection(gameDescriptions, sizeof(LilliputGameDescription), lilliputGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "lilliput";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Lilliput";
}

4
engines/lure/detection.cpp
View File

@ -279,11 +279,11 @@ public:
_guiOptions = GUIO1(GUIO_NOSPEECH);
}
const char *getEngineId() const override {
const char *getName() const override {
return "lure";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Lure of the Temptress";
}

4
engines/macventure/detection.cpp
View File

@ -71,11 +71,11 @@ public:
_md5Bytes = 5000000; // TODO: Upper limit, adjust it once all games are added
}
const char *getEngineId() const override {
const char *getName() const override {
return "macventure";
}
const char *getName() const override {
const char *getEngineName() const override {
return "MacVenture";
}

4
engines/made/detection.cpp
View File

@ -60,11 +60,11 @@ public:
MadeMetaEngineDetection() : AdvancedMetaEngineDetection(Made::gameDescriptions, sizeof(Made::MadeGameDescription), madeGames, Made::optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "made";
}
const char *getName() const override {
const char *getEngineName() const override {
return "MADE";
}

4
engines/mads/detection.cpp
View File

@ -139,11 +139,11 @@ public:
_maxScanDepth = 3;
}
const char *getEngineId() const override {
const char *getName() const override {
return "mads";
}
const char *getName() const override {
const char *getEngineName() const override {
return "MADS";
}

5
engines/metaengine.h
View File

@ -141,7 +141,10 @@ public:
virtual ~MetaEngineDetection() {}
/** Get the engine ID. */
virtual const char *getEngineId() const = 0;
virtual const char *getName() const = 0;
/** Get the engine name. */
virtual const char *getEngineName() const = 0;
/** Return some copyright information about the original engine. */
virtual const char *getOriginalCopyright() const = 0;

4
engines/mohawk/detection.cpp
View File

@ -89,11 +89,11 @@ public:
return detectGameFilebased(allFiles, Mohawk::fileBased);
}
const char *getEngineId() const override {
const char *getName() const override {
return "mohawk";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Mohawk";
}

4
engines/mortevielle/detection.cpp
View File

@ -48,11 +48,11 @@ public:
_flags = kADFlagUseExtraAsHint;
}
const char *getEngineId() const override {
const char *getName() const override {
return "mortevielle";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Mortville Manor";
}

4
engines/mtropolis/detection.cpp
View File

@ -112,11 +112,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "mtropolis";
}
const char *getName() const override {
const char *getEngineName() const override {
return "mTropolis";
}

4
engines/mutationofjb/detection.cpp
View File

@ -103,11 +103,11 @@ public:
_directoryGlobs = mutationofjbDirectoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "mutationofjb";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Mutation of J.B.";
}

4
engines/myst3/detection.cpp
View File

@ -229,11 +229,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getName() const override {
const char *getEngineName() const override {
return "Myst III";
}
const char *getEngineId() const override {
const char *getName() const override {
return "myst3";
}

4
engines/nancy/detection.cpp
View File

@ -230,11 +230,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "nancy";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Nancy Drew";
}

4
engines/neverhood/detection.cpp
View File

@ -178,11 +178,11 @@ public:
_guiOptions = GUIO5(GUIO_NOSUBTITLES, GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_SKIP_HALL_OF_RECORDS, GAMEOPTION_SCALE_MAKING_OF_VIDEOS);
}
const char *getEngineId() const override {
const char *getName() const override {
return "neverhood";
}
const char *getName() const override {
const char *getEngineName() const override {
return "The Neverhood Chronicles";
}

4
engines/ngi/detection.cpp
View File

@ -190,11 +190,11 @@ public:
NGIMetaEngineDetection() : AdvancedMetaEngineDetection(NGI::gameDescriptions, sizeof(NGI::NGIGameDescription), ngiGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "ngi";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Nikita Game Interface";
}

4
engines/parallaction/detection.cpp
View File

@ -206,11 +206,11 @@ public:
_guiOptions = GUIO1(GUIO_NOLAUNCHLOAD);
}
const char *getEngineId() const override {
const char *getName() const override {
return "parallaction";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Parallaction";
}

4
engines/pegasus/detection.cpp
View File

@ -149,11 +149,11 @@ public:
PegasusMetaEngineDetection() : AdvancedMetaEngineDetection(Pegasus::gameDescriptions, sizeof(Pegasus::PegasusGameDescription), pegasusGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "pegasus";
}
const char *getName() const override {
const char *getEngineName() const override {
return "The Journeyman Project: Pegasus Prime";
}

4
engines/petka/detection.cpp
View File

@ -49,11 +49,11 @@ public:
_maxScanDepth = 2;
}
const char *getEngineId() const override {
const char *getName() const override {
return "petka";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Red Comrades";
}

4
engines/pink/detection.cpp
View File

@ -56,11 +56,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "pink";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Pink Panther";
}

4
engines/playground3d/detection.cpp
View File

@ -48,11 +48,11 @@ public:
_md5Bytes = 512;
}
const char *getEngineId() const override {
const char *getName() const override {
return "playground3d";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Playground 3d: the testing and playground environment for 3d renderers";
}

4
engines/plumbers/detection.cpp
View File

@ -71,11 +71,11 @@ public:
PlumbersMetaEngineDetection() : AdvancedMetaEngineDetection(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "plumbers";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Plumbers Don't Wear Ties";
}

4
engines/prince/detection.cpp
View File

@ -168,11 +168,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "prince";
}
const char *getName() const override {
const char *getEngineName() const override {
return "The Prince and the Coward";
}

4
engines/private/detection.cpp
View File

@ -233,11 +233,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "private";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Private Eye";
}

4
engines/queen/detection.cpp
View File

@ -485,11 +485,11 @@ public:
QueenMetaEngineDetection() : AdvancedMetaEngineDetection(Queen::gameDescriptions, sizeof(Queen::QueenGameDescription), queenGames, optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "queen";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Flight of the Amazon Queen";
}

4
engines/saga/detection.cpp
View File

@ -42,11 +42,11 @@ public:
_directoryGlobs = DIRECTORY_GLOBS;
}
const char *getEngineId() const override {
const char *getName() const override {
return "saga";
}
const char *getName() const override {
const char *getEngineName() const override {
return "SAGA ["
#if defined(ENABLE_IHNM)

4
engines/saga2/detection.cpp
View File

@ -134,11 +134,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "saga2";
}
const char *getName() const override {
const char *getEngineName() const override {
return "SAGA2";
}

6
engines/sci/detection.cpp
View File

@ -192,11 +192,11 @@ public:
return debugFlagList;
}
const char *getEngineId() const override {
const char *getName() const override {
return "sci";
}
const char *getName() const override {
const char *getEngineName() const override {
return "SCI ["
#ifdef ENABLE_SCI32
"all games"
@ -226,7 +226,7 @@ ADDetectedGame SciMetaEngineDetection::fallbackDetect(const FileMap &allFiles, c
}
}
const Plugin *metaEnginePlugin = EngineMan.findPlugin(getEngineId());
const Plugin *metaEnginePlugin = EngineMan.findPlugin(getName());
if (metaEnginePlugin) {
const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);

8
engines/scumm/detection.cpp
View File

@ -69,7 +69,7 @@ using namespace Scumm;
class ScummMetaEngineDetection : public MetaEngineDetection {
public:
const char *getEngineId() const override {
const char *getName() const override {
return "scumm";
}
@ -77,7 +77,7 @@ public:
return debugFlagList;
}
const char *getName() const override;
const char *getEngineName() const override;
const char *getOriginalCopyright() const override;
PlainGameList getSupportedGames() const override;
@ -131,7 +131,7 @@ DetectedGames ScummMetaEngineDetection::detectGames(const Common::FSList &fslist
const PlainGameDescriptor *g = findPlainGameDescriptor(x->game.gameid, gameDescriptions);
assert(g);
DetectedGame game = DetectedGame(getEngineId(), x->game.gameid, g->description, x->language, x->game.platform, x->extra);
DetectedGame game = DetectedGame(getName(), x->game.gameid, g->description, x->language, x->game.platform, x->extra);
// Compute and set the preferred target name for this game.
// Based on generateComplexID() in advancedDetector.cpp.
@ -146,7 +146,7 @@ DetectedGames ScummMetaEngineDetection::detectGames(const Common::FSList &fslist
return detectedGames;
}
const char *ScummMetaEngineDetection::getName() const {
const char *ScummMetaEngineDetection::getEngineName() const {
return "SCUMM ["
#if defined(ENABLE_SCUMM_7_8) && defined(ENABLE_HE)

4
engines/sherlock/detection.cpp
View File

@ -148,11 +148,11 @@ public:
SherlockMetaEngineDetection() : AdvancedMetaEngineDetection(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription),
sherlockGames, optionsList) {}
const char *getEngineId() const override {
const char *getName() const override {
return "sherlock";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Sherlock";
}

10
engines/sky/detection.cpp
View File

@ -66,10 +66,10 @@ static const SkyVersion skyVersions[] = {
class SkyMetaEngineDetection : public MetaEngineDetection {
public:
const char *getName() const override;
const char *getEngineName() const override;
const char *getOriginalCopyright() const override;
const char *getEngineId() const override {
const char *getName() const override {
return "sky";
}
@ -79,7 +79,7 @@ public:
DetectedGames detectGames(const Common::FSList &fslist, uint32 /*skipADFlags*/, bool /*skipIncomplete*/) override;
};
const char *SkyMetaEngineDetection::getName() const {
const char *SkyMetaEngineDetection::getEngineName() const {
return "Beneath a Steel Sky";
}
@ -162,12 +162,12 @@ DetectedGames SkyMetaEngineDetection::detectGames(const Common::FSList &fslist,
if (sv->dinnerTableEntries) {
Common::String extra = Common::String::format("v0.0%d %s", sv->version, sv->extraDesc);
DetectedGame game = DetectedGame(getEngineId(), skySetting.gameId, skySetting.description, Common::UNK_LANG, Common::kPlatformUnknown, extra);
DetectedGame game = DetectedGame(getName(), skySetting.gameId, skySetting.description, Common::UNK_LANG, Common::kPlatformUnknown, extra);
game.setGUIOptions(sv->guioptions);
detectedGames.push_back(game);
} else {
detectedGames.push_back(DetectedGame(getEngineId(), skySetting.gameId, skySetting.description));
detectedGames.push_back(DetectedGame(getName(), skySetting.gameId, skySetting.description));
}
}

4
engines/sludge/detection.cpp
View File

@ -80,11 +80,11 @@ public:
_maxScanDepth = 1;
}
const char *getEngineId() const override {
const char *getName() const override {
return "sludge";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Sludge";
}

4
engines/stark/detection.cpp
View File

@ -424,11 +424,11 @@ public:
_guiOptions = GUIO4(GUIO_NOMIDI, GAMEOPTION_ASSETS_MOD, GAMEOPTION_LINEAR_FILTERING, GAMEOPTION_FONT_ANTIALIASING);
}
const char *getName() const override {
const char *getEngineName() const override {
return "Stark";
}
const char *getEngineId() const override {
const char *getName() const override {
return "stark";
}

4
engines/startrek/detection.cpp
View File

@ -361,11 +361,11 @@ public:
return debugFlagList;
}
const char *getEngineId() const override {
const char *getName() const override {
return "startrek";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Star Trek";
}

4
engines/supernova/detection.cpp
View File

@ -126,11 +126,11 @@ public:
SupernovaMetaEngineDetection() : AdvancedMetaEngineDetection(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "supernova";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Mission Supernova";
}

16
engines/sword1/detection.cpp
View File

@ -72,11 +72,11 @@ static const char *const g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files h
class SwordMetaEngineDetection : public MetaEngineDetection {
public:
const char *getEngineId() const override {
const char *getName() const override {
return "sword1";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Broken Sword: The Shadow of the Templars";
}
const char *getOriginalCopyright() const override {
@ -187,17 +187,17 @@ DetectedGames SwordMetaEngineDetection::detectGames(const Common::FSList &fslist
DetectedGame game;
if (mainFilesFound && pcFilesFound && demoFilesFound)
game = DetectedGame(getEngineId(), sword1DemoSettings);
game = DetectedGame(getName(), sword1DemoSettings);
else if (mainFilesFound && pcFilesFound && psxFilesFound)
game = DetectedGame(getEngineId(), sword1PSXSettings);
game = DetectedGame(getName(), sword1PSXSettings);
else if (mainFilesFound && pcFilesFound && psxDemoFilesFound)
game = DetectedGame(getEngineId(), sword1PSXDemoSettings);
game = DetectedGame(getName(), sword1PSXDemoSettings);
else if (mainFilesFound && pcFilesFound && !psxFilesFound)
game = DetectedGame(getEngineId(), sword1FullSettings);
game = DetectedGame(getName(), sword1FullSettings);
else if (mainFilesFound && macFilesFound)
game = DetectedGame(getEngineId(), sword1MacFullSettings);
game = DetectedGame(getName(), sword1MacFullSettings);
else if (mainFilesFound && macDemoFilesFound)
game = DetectedGame(getEngineId(), sword1MacDemoSettings);
game = DetectedGame(getName(), sword1MacDemoSettings);
else
return detectedGames;

4
engines/sword2/detection.cpp
View File

@ -39,11 +39,11 @@ static const ExtraGuiOption sword2ExtraGuiOption = {
class Sword2MetaEngineDetection : public MetaEngineDetection {
public:
const char *getEngineId() const override {
const char *getName() const override {
return "sword2";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Broken Sword II: The Smoking Mirror";
}
const char *getOriginalCopyright() const override {

4
engines/sword25/detection.cpp
View File

@ -66,11 +66,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "sword25";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Broken Sword 2.5";
}

4
engines/teenagent/detection.cpp
View File

@ -207,11 +207,11 @@ public:
TeenAgentMetaEngineDetection() : AdvancedMetaEngineDetection(teenAgentGameDescriptions, sizeof(ADGameDescription), teenAgentGames) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "teenagent";
}
const char *getName() const override {
const char *getEngineName() const override {
return "TeenAgent";
}

4
engines/testbed/detection.cpp
View File

@ -54,11 +54,11 @@ public:
_md5Bytes = 512;
}
const char *getEngineId() const override {
const char *getName() const override {
return "testbed";
}
const char *getName() const override {
const char *getEngineName() const override {
return "TestBed: The Backend Testing Framework";
}

4
engines/tinsel/detection.cpp
View File

@ -50,11 +50,11 @@ public:
TinselMetaEngineDetection() : AdvancedMetaEngineDetection(Tinsel::gameDescriptions, sizeof(Tinsel::TinselGameDescription), tinselGames) {
}
const char *getEngineId() const override{
const char *getName() const override{
return "tinsel";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Tinsel";
}

4
engines/titanic/detection.cpp
View File

@ -48,11 +48,11 @@ public:
_maxScanDepth = 3;
}
const char *getEngineId() const override {
const char *getName() const override {
return "titanic";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Starship Titanic";
}

4
engines/toltecs/detection.cpp
View File

@ -243,11 +243,11 @@ public:
ToltecsMetaEngineDetection() : AdvancedMetaEngineDetection(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames, Toltecs::optionsList) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "toltecs";
}
const char *getName() const override {
const char *getEngineName() const override {
return "3 Skulls of the Toltecs";
}

4
engines/tony/detection.cpp
View File

@ -54,11 +54,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "tony";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Tony Tough and the Night of Roasted Moths";
}

4
engines/toon/detection.cpp
View File

@ -158,11 +158,11 @@ public:
return detectGameFilebased(allFiles, Toon::fileBasedFallback);
}
const char *getEngineId() const override {
const char *getName() const override {
return "toon";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Toonstruck";
}

4
engines/touche/detection.cpp
View File

@ -141,11 +141,11 @@ public:
return detectGameFilebased(allFiles, Touche::fileBasedFallback);
}
const char *getEngineId() const override {
const char *getName() const override {
return "touche";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Touche: The Adventures of the Fifth Musketeer";
}

4
engines/trecision/detection.cpp
View File

@ -243,11 +243,11 @@ public:
_guiOptions = GUIO2(GUIO_NOMIDI, GAMEOPTION_ORIGINAL_SAVELOAD);
}
const char *getEngineId() const override {
const char *getName() const override {
return "trecision";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Trecision Adventure Module";
}

4
engines/tsage/detection.cpp
View File

@ -46,11 +46,11 @@ public:
TSageMetaEngineDetection() : AdvancedMetaEngineDetection(TsAGE::gameDescriptions, sizeof(TsAGE::tSageGameDescription), tSageGameTitles) {
}
const char *getEngineId() const override {
const char *getName() const override {
return "tsage";
}
const char *getName() const override {
const char *getEngineName() const override {
return "TsAGE";
}

4
engines/tucker/detection.cpp
View File

@ -121,11 +121,11 @@ public:
_md5Bytes = 512;
}
const char *getEngineId() const override {
const char *getName() const override {
return "tucker";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Bud Tucker in Double Trouble";
}

4
engines/twine/detection.cpp
View File

@ -1152,11 +1152,11 @@ public:
_guiOptions = GUIO12(GAMEOPTION_WALL_COLLISION, GAMEOPTION_DISABLE_SAVE_MENU, GAMEOPTION_DEBUG, GAMEOPTION_AUDIO_CD, GAMEOPTION_SOUND, GAMEOPTION_VOICES, GAMEOPTION_TEXT, GAMEOPTION_MOVIES, GAMEOPTION_MOUSE, GAMEOPTION_USA_VERSION, GAMEOPTION_HIGH_RESOLUTION, GAMEOPTION_TEXT_TO_SPEECH);
}
const char *getEngineId() const override {
const char *getName() const override {
return "twine";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Little Big Adventure";
}

4
engines/ultima/detection.h
View File

@ -75,11 +75,11 @@ public:
UltimaMetaEngineDetection();
~UltimaMetaEngineDetection() override {}
const char *getEngineId() const override {
const char *getName() const override {
return "ultima";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Ultima";
}

4
engines/voyeur/detection.cpp
View File

@ -45,11 +45,11 @@ public:
_maxScanDepth = 3;
}
const char *getEngineId() const override {
const char *getName() const override {
return "voyeur";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Voyeur";
}

4
engines/wage/detection.cpp
View File

@ -46,11 +46,11 @@ public:
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
}
const char *getEngineId() const override {
const char *getName() const override {
return "wage";
}
const char *getName() const override {
const char *getEngineName() const override {
return "World Adventure Game Engine";
}

6
engines/wintermute/detection.cpp
View File

@ -109,11 +109,11 @@ public:
_directoryGlobs = directoryGlobs;
}
const char *getEngineId() const override {
const char *getName() const override {
return "wintermute";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Wintermute";
}
@ -138,7 +138,7 @@ public:
}
}
const Plugin *metaEnginePlugin = EngineMan.findPlugin(getEngineId());
const Plugin *metaEnginePlugin = EngineMan.findPlugin(getName());
if (metaEnginePlugin) {
const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);

4
engines/xeen/detection.cpp
View File

@ -83,11 +83,11 @@ public:
_maxScanDepth = 3;
}
const char *getEngineId() const override {
const char *getName() const override {
return "xeen";
}
const char *getName() const override {
const char *getEngineName() const override {
return "Xeen";
}

Some files were not shown because too many files have changed in this diff Show More