[Scummvm-git-logs] scummvm master -> d9e5c709d4c5548f391aab6835ac27f260aed2bc

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d9e5c709d4 GLK: ALAN3: Move Alan3 out of release build ifdef


Commit: d9e5c709d4c5548f391aab6835ac27f260aed2bc
    https://github.com/scummvm/scummvm/commit/d9e5c709d4c5548f391aab6835ac27f260aed2bc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-07-06T19:40:04-07:00

Commit Message:
GLK: ALAN3: Move Alan3 out of release build ifdef

Changed paths:
    engines/glk/alan2/alan2.cpp
    engines/glk/detection.cpp


diff --git a/engines/glk/alan2/alan2.cpp b/engines/glk/alan2/alan2.cpp
index 76904fb..ccac7a6 100644
--- a/engines/glk/alan2/alan2.cpp
+++ b/engines/glk/alan2/alan2.cpp
@@ -161,7 +161,7 @@ static void syncEventQueue(Common::Serializer &s) {
 	EvtqElem *arr = eventq;
 
 	if (s.isLoading()) {
-		for (i = 0; arr[i - 1].time; ++i)
+		for (i = 0; arr[i - 1].time != 0; ++i)
 			arr[i].synchronize(s);
 		etop = i - 1;
 	} else {
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index f7ba0a6..3037fe9 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -149,12 +149,12 @@ Common::Error GlkMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
 	*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::Alan3::Alan3MetaEngine, Glk::Alan3::Alan3>(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::Alan3::Alan3MetaEngine, Glk::Alan3::Alan3>(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)
@@ -196,12 +196,12 @@ PlainGameList GlkMetaEngine::getSupportedGames() const {
 	PlainGameList list;
 	Glk::AdvSys::AdvSysMetaEngine::getSupportedGames(list);
 	Glk::Alan2::Alan2MetaEngine::getSupportedGames(list);
+	Glk::Alan3::Alan3MetaEngine::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::Alan3::Alan3MetaEngine::getSupportedGames(list);
 	Glk::Magnetic::MagneticMetaEngine::getSupportedGames(list);
 	Glk::TADS::TADSMetaEngine::getSupportedGames(list);
 #endif
@@ -216,6 +216,9 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const {
 	gd = Glk::Alan2::Alan2MetaEngine::findGame(gameId);
 	if (gd._description) return gd;
 
+	gd = Glk::Alan3::Alan3MetaEngine::findGame(gameId);
+	if (gd._description) return gd;
+
 	gd = Glk::Frotz::FrotzMetaEngine::findGame(gameId);
 	if (gd._description) return gd;
 
@@ -229,9 +232,6 @@ PlainGameDescriptor GlkMetaEngine::findGame(const char *gameId) const {
 	if (gd._description) return gd;
 
 #ifndef RELEASE_BUILD
-	gd = Glk::Alan3::Alan3MetaEngine::findGame(gameId);
-	if (gd._description) return gd;
-
 	gd = Glk::Magnetic::MagneticMetaEngine::findGame(gameId);
 	if (gd._description) return gd;
 
@@ -248,13 +248,13 @@ DetectedGames GlkMetaEngine::detectGames(const Common::FSList &fslist) const {
 	DetectedGames detectedGames;
 	Glk::AdvSys::AdvSysMetaEngine::detectGames(fslist, detectedGames);
 	Glk::Alan2::Alan2MetaEngine::detectGames(fslist, detectedGames);
+	Glk::Alan3::Alan3MetaEngine::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::Alan3::Alan3MetaEngine::detectGames(fslist, detectedGames);
 	Glk::Magnetic::MagneticMetaEngine::detectGames(fslist, detectedGames);
 	Glk::TADS::TADSMetaEngine::detectGames(fslist, detectedGames);
 #endif
@@ -266,13 +266,13 @@ void GlkMetaEngine::detectClashes() const {
 	Common::StringMap map;
 	Glk::AdvSys::AdvSysMetaEngine::detectClashes(map);
 	Glk::Alan2::Alan2MetaEngine::detectClashes(map);
+	Glk::Alan3::Alan3MetaEngine::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::Alan3::Alan3MetaEngine::detectClashes(map);
 	Glk::Magnetic::MagneticMetaEngine::detectClashes(map);
 	Glk::TADS::TADSMetaEngine::detectClashes(map);
 #endif