diff options
author | Paul Gilbert | 2019-05-16 11:27:55 -1000 |
---|---|---|
committer | Paul Gilbert | 2019-05-24 18:21:06 -0700 |
commit | b1f8e2ce837608ee18ebabe1097d64faae9c2243 (patch) | |
tree | a70a446b408a127cd13c5c99ee768d9be57e710f /engines/glk | |
parent | 9bfca34497786bcaa05d01f13e8f97f500a3ef45 (diff) | |
download | scummvm-rg350-b1f8e2ce837608ee18ebabe1097d64faae9c2243.tar.gz scummvm-rg350-b1f8e2ce837608ee18ebabe1097d64faae9c2243.tar.bz2 scummvm-rg350-b1f8e2ce837608ee18ebabe1097d64faae9c2243.zip |
GLK: HUGO: Move Hugo engine out of RELEASE_BUILD blocks
Diffstat (limited to 'engines/glk')
-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 fe2ea0bdea..a13bed3cfc 100644 --- a/engines/glk/detection.cpp +++ b/engines/glk/detection.cpp @@ -113,10 +113,10 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons *engine = nullptr; 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::Hugo::HugoMetaEngine, Glk::Hugo::Hugo>(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) @@ -158,10 +158,10 @@ PlainGameList GlkMetaEngine::getSupportedGames() const { PlainGameList 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::Hugo::HugoMetaEngine::getSupportedGames(list); Glk::Magnetic::MagneticMetaEngine::getSupportedGames(list); Glk::TADS::TADSMetaEngine::getSupportedGames(list); #endif @@ -176,6 +176,9 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { gd = Glk::Glulxe::GlulxeMetaEngine::findGame(gameId); if (gd._description) return gd; + gd = Glk::Hugo::HugoMetaEngine::findGame(gameId); + if (gd._description) return gd; + gd = Glk::Scott::ScottMetaEngine::findGame(gameId); if (gd._description) return gd; @@ -183,9 +186,6 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const { gd = Glk::Alan2::Alan2MetaEngine::findGame(gameId); if (gd._description) return gd; - gd = Glk::Hugo::HugoMetaEngine::findGame(gameId); - if (gd._description) return gd; - gd = Glk::Magnetic::MagneticMetaEngine::findGame(gameId); if (gd._description) return gd; @@ -202,11 +202,11 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const { DetectedGames 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::Hugo::HugoMetaEngine::detectGames(fslist, detectedGames); Glk::Magnetic::MagneticMetaEngine::detectGames(fslist, detectedGames); Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames); #endif @@ -218,11 +218,11 @@ void GlkMetaEngine::detectClashes() const { Common::StringMap 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::Hugo::HugoMetaEngine::detectClashes(map); Glk::Magnetic::MagneticMetaEngine::detectClashes(map); Glk::TADS::TADSMetaEngine::detectClashes(map); #endif |