diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/glk/detection.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp index fa45099b68..beeb410830 100644 --- a/engines/glk/detection.cpp +++ b/engines/glk/detection.cpp @@ -115,12 +115,12 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons // Create the correct engine *engine = nullptr; if ((*engine = create<Glk::AdvSys::AdvSysMetaEngine, Glk::AdvSys::AdvSys>(syst, gameDesc)) != nullptr) {} + else if ((*engine = create<Glk::Alan2::Alan2MetaEngine, Glk::Alan2::Alan2>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Frotz::FrotzMetaEngine, Glk::Frotz::Frotz>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Glulxe::GlulxeMetaEngine, Glk::Glulxe::Glulxe>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Hugo::HugoMetaEngine, Glk::Hugo::Hugo>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Scott::ScottMetaEngine, Glk::Scott::Scott>(syst, gameDesc)) != nullptr) {} #ifndef RELEASE_BUILD - else if ((*engine = create<Glk::Alan2::Alan2MetaEngine, Glk::Alan2::Alan2>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Magnetic::MagneticMetaEngine, Glk::Magnetic::Magnetic>(syst, gameDesc)) != nullptr) {} else if ((td = Glk::TADS::TADSMetaEngine::findGame(gameDesc._gameId.c_str()))._description) { if (td._options & Glk::TADS::OPTION_TADS3) @@ -161,12 +161,12 @@ Common::String GlkMetaEngine::findFileByGameId(const Common::String &gameId) con PlainGameList GlkMetaEngine::getSupportedGames() const { PlainGameList list; Glk::AdvSys::AdvSysMetaEngine::getSupportedGames(list); + Glk::Alan2::Alan2MetaEngine::getSupportedGames(list); Glk::Frotz::FrotzMetaEngine::getSupportedGames(list); Glk::Glulxe::GlulxeMetaEngine::getSupportedGames(list); Glk::Hugo::HugoMetaEngine::getSupportedGames(list); Glk::Scott::ScottMetaEngine::getSupportedGames(list); #ifndef RELEASE_BUILD - Glk::Alan2::Alan2MetaEngine::getSupportedGames(list); Glk::Magnetic::MagneticMetaEngine::getSupportedGames(list); Glk::TADS::TADSMetaEngine::getSupportedGames(list); #endif @@ -178,6 +178,9 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { Glk::GameDescriptor gd = Glk::AdvSys::AdvSysMetaEngine::findGame(gameId); if (gd._description) return gd; + gd = Glk::Alan2::Alan2MetaEngine::findGame(gameId); + if (gd._description) return gd; + gd = Glk::Frotz::FrotzMetaEngine::findGame(gameId); if (gd._description) return gd; @@ -191,8 +194,6 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { if (gd._description) return gd; #ifndef RELEASE_BUILD - gd = Glk::Alan2::Alan2MetaEngine::findGame(gameId); - if (gd._description) return gd; gd = Glk::Magnetic::MagneticMetaEngine::findGame(gameId); if (gd._description) return gd; @@ -209,13 +210,13 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const { DetectedGames detectedGames; Glk::AdvSys::AdvSysMetaEngine::detectGames(fslist, detectedGames); + Glk::Alan2::Alan2MetaEngine::detectGames(fslist, detectedGames); Glk::Frotz::FrotzMetaEngine::detectGames(fslist, detectedGames); Glk::Glulxe::GlulxeMetaEngine::detectGames(fslist, detectedGames); Glk::Hugo::HugoMetaEngine::detectGames(fslist, detectedGames); Glk::Scott::ScottMetaEngine::detectGames(fslist, detectedGames); #ifndef RELEASE_BUILD - Glk::Alan2::Alan2MetaEngine::detectGames(fslist, detectedGames); Glk::Magnetic::MagneticMetaEngine::detectGames(fslist, detectedGames); Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames); #endif @@ -226,13 +227,13 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const { void GlkMetaEngine::detectClashes() const { Common::StringMap map; Glk::AdvSys::AdvSysMetaEngine::detectClashes(map); + Glk::Alan2::Alan2MetaEngine::detectClashes(map); Glk::Frotz::FrotzMetaEngine::detectClashes(map); Glk::Glulxe::GlulxeMetaEngine::detectClashes(map); Glk::Hugo::HugoMetaEngine::detectClashes(map); Glk::Scott::ScottMetaEngine::detectClashes(map); #ifndef RELEASE_BUILD - Glk::Alan2::Alan2MetaEngine::detectClashes(map); Glk::Magnetic::MagneticMetaEngine::detectClashes(map); Glk::TADS::TADSMetaEngine::detectClashes(map); #endif |