diff options
author | Paul Gilbert | 2019-10-10 20:38:56 -0700 |
---|---|---|
committer | Paul Gilbert | 2019-10-11 18:43:34 -0700 |
commit | 17df8305000cf5f52593f1807d4a913526de2188 (patch) | |
tree | 5c8946b7aac1ad130df9cb803c0a862c2d4f3624 | |
parent | e779ebce4f5b68989708679fed13d06cad6197b2 (diff) | |
download | scummvm-rg350-17df8305000cf5f52593f1807d4a913526de2188.tar.gz scummvm-rg350-17df8305000cf5f52593f1807d4a913526de2188.tar.bz2 scummvm-rg350-17df8305000cf5f52593f1807d4a913526de2188.zip |
GLK: JACL: Move JACL out of RELEASE_BUILD exclusion
-rw-r--r-- | engines/glk/detection.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp index 08dd7d0ce6..325e15be6a 100644 --- a/engines/glk/detection.cpp +++ b/engines/glk/detection.cpp @@ -167,10 +167,10 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons 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::JACL::JACLMetaEngine, Glk::JACL::JACL>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Quest::QuestMetaEngine, Glk::Quest::Quest>(syst, gameDesc)) != nullptr) {} else if ((*engine = create<Glk::Scott::ScottMetaEngine, Glk::Scott::Scott>(syst, gameDesc)) != nullptr) {} #ifndef RELEASE_BUILD - else if ((*engine = create<Glk::JACL::JACLMetaEngine, Glk::JACL::JACL>(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) @@ -217,10 +217,10 @@ PlainGameList GlkMetaEngine::getSupportedGames() const { Glk::Frotz::FrotzMetaEngine::getSupportedGames(list); Glk::Glulxe::GlulxeMetaEngine::getSupportedGames(list); Glk::Hugo::HugoMetaEngine::getSupportedGames(list); + Glk::JACL::JACLMetaEngine::getSupportedGames(list); Glk::Quest::QuestMetaEngine::getSupportedGames(list); Glk::Scott::ScottMetaEngine::getSupportedGames(list); #ifndef RELEASE_BUILD - Glk::JACL::JACLMetaEngine::getSupportedGames(list); Glk::Magnetic::MagneticMetaEngine::getSupportedGames(list); Glk::TADS::TADSMetaEngine::getSupportedGames(list); #endif @@ -250,6 +250,9 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { gd = Glk::Hugo::HugoMetaEngine::findGame(gameId); if (gd._description) return gd; + gd = Glk::JACL::JACLMetaEngine::findGame(gameId); + if (gd._description) return gd; + gd = Glk::Quest::QuestMetaEngine::findGame(gameId); if (gd._description) return gd; @@ -257,9 +260,6 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { if (gd._description) return gd; #ifndef RELEASE_BUILD - gd = Glk::JACL::JACLMetaEngine::findGame(gameId); - if (gd._description) return gd; - gd = Glk::Magnetic::MagneticMetaEngine::findGame(gameId); if (gd._description) return gd; @@ -281,11 +281,11 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const { Glk::Frotz::FrotzMetaEngine::detectGames(fslist, detectedGames); Glk::Glulxe::GlulxeMetaEngine::detectGames(fslist, detectedGames); Glk::Hugo::HugoMetaEngine::detectGames(fslist, detectedGames); + Glk::JACL::JACLMetaEngine::detectGames(fslist, detectedGames); Glk::Quest::QuestMetaEngine::detectGames(fslist, detectedGames); Glk::Scott::ScottMetaEngine::detectGames(fslist, detectedGames); #ifndef RELEASE_BUILD - Glk::JACL::JACLMetaEngine::detectGames(fslist, detectedGames); Glk::Magnetic::MagneticMetaEngine::detectGames(fslist, detectedGames); Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames); #endif @@ -302,11 +302,11 @@ void GlkMetaEngine::detectClashes() const { Glk::Frotz::FrotzMetaEngine::detectClashes(map); Glk::Glulxe::GlulxeMetaEngine::detectClashes(map); Glk::Hugo::HugoMetaEngine::detectClashes(map); + Glk::JACL::JACLMetaEngine::detectClashes(map); Glk::Quest::QuestMetaEngine::detectClashes(map); Glk::Scott::ScottMetaEngine::detectClashes(map); #ifndef RELEASE_BUILD - Glk::JACL::JACLMetaEngine::detectClashes(map); Glk::Magnetic::MagneticMetaEngine::detectClashes(map); Glk::TADS::TADSMetaEngine::detectClashes(map); #endif |