[Scummvm-git-logs] scummvm master -> 2c7d2f135b712be43efe1c95dd27f840da6dcdf3

[dreammaster]

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

Summary:
3cd57d537c GLK: COMPREHEND: Fix size of parsed words array
0c6c8274b4 GLK: COMPREHEND: Mark complete games for testing
2c7d2f135b GLK: GLULX: Mark games for testing


Commit: 3cd57d537cc475d5657af817f41c59ac36f2059a
    https://github.com/scummvm/scummvm/commit/3cd57d537cc475d5657af817f41c59ac36f2059a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-20T11:10:00-08:00

Commit Message:
GLK: COMPREHEND: Fix size of parsed words array

Changed paths:
    engines/glk/comprehend/game.h


diff --git a/engines/glk/comprehend/game.h b/engines/glk/comprehend/game.h
index 85758f8b38..3d91d3be7d 100644
--- a/engines/glk/comprehend/game.h
+++ b/engines/glk/comprehend/game.h
@@ -43,7 +43,7 @@ struct GameStrings;
 struct Sentence;
 
 struct Sentence {
-	Word _words[4];
+	Word _words[20];
 	size_t _nr_words;
 	byte _formattedWords[6];
 	byte _specialOpcodeVal2;


Commit: 0c6c8274b4d05e96b298758ccd901196efeb9280
    https://github.com/scummvm/scummvm/commit/0c6c8274b4d05e96b298758ccd901196efeb9280
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-20T11:10:00-08:00

Commit Message:
GLK: COMPREHEND: Mark complete games for testing

Changed paths:
    engines/glk/comprehend/comprehend.cpp
    engines/glk/comprehend/detection.cpp
    engines/glk/comprehend/detection_tables.h


diff --git a/engines/glk/comprehend/comprehend.cpp b/engines/glk/comprehend/comprehend.cpp
index 240a41d346..e723e146c7 100644
--- a/engines/glk/comprehend/comprehend.cpp
+++ b/engines/glk/comprehend/comprehend.cpp
@@ -116,9 +116,9 @@ void Comprehend::createGame() {
 		_game = new OOToposGame();
 	else if (_gameDescription._gameId == "talisman")
 		_game = new TalismanGame();
-	else if (_gameDescription._gameId == "transylvania" && _gameDescription._filename.equalsIgnoreCase("tr.gda"))
+	else if (_gameDescription._gameId == "transylvania")
 		_game = new TransylvaniaGame1();
-	else if (_gameDescription._gameId == "transylvania" && _gameDescription._filename.equalsIgnoreCase("g0"))
+	else if (_gameDescription._gameId == "transylvaniav2")
 		_game = new TransylvaniaGame2();
 	else
 		error("Unknown game");
diff --git a/engines/glk/comprehend/detection.cpp b/engines/glk/comprehend/detection.cpp
index 83931bebf3..bd5fa76577 100644
--- a/engines/glk/comprehend/detection.cpp
+++ b/engines/glk/comprehend/detection.cpp
@@ -39,7 +39,9 @@ GameDescriptor ComprehendMetaEngine::findGame(const char *gameId) {
 	for (const PlainGameDescriptor *pd = COMPREHEND_GAME_LIST; pd->gameId; ++pd) {
 		if (!strcmp(gameId, pd->gameId)) {
 			GameDescriptor gd = *pd;
-			gd._supportLevel = kUnstableGame;
+			Common::String s(pd->gameId);
+			gd._supportLevel = (s == "transylvaniav2" || s == "talisman") ?
+				kUnstableGame : kTestingGame;
 			return gd;
 		}
 	}
@@ -79,7 +81,8 @@ bool ComprehendMetaEngine::detectGames(const Common::FSList &fslist, DetectedGam
 				if (p->_md5 == md5) {
 					// Found a match
 					PlainGameDescriptor gameDesc = findGame(p->_gameId);
-					gameList.push_back(GlkDetectedGame(p->_gameId, gameDesc.description, filename));
+					GlkDetectedGame gd(p->_gameId, gameDesc.description, filename);
+					gameList.push_back(gd);
 				}
 			}
 		}
diff --git a/engines/glk/comprehend/detection_tables.h b/engines/glk/comprehend/detection_tables.h
index 2364eef4b5..268bb2af35 100644
--- a/engines/glk/comprehend/detection_tables.h
+++ b/engines/glk/comprehend/detection_tables.h
@@ -28,12 +28,13 @@ namespace Glk {
 namespace Comprehend {
 
 const PlainGameDescriptor COMPREHEND_GAME_LIST[] = {
+	{"transylvania", "Transylvania"},
 	{"crimsoncrown", "Crimson Crown"},
 	{"ootopos", "OO-Topos"},
-#ifndef RELEASE_BUILD
+
+	{"transylvaniav2", "Transylvania (V2)"},
 	{"talisman", "Talisman: Challenging the Sands of Time"},
-#endif
-	{"transylvania", "Transylvania"},
+
 	{nullptr, nullptr}
 };
 
@@ -44,15 +45,12 @@ struct ComprehendDetectionEntry {
 };
 
 const ComprehendDetectionEntry COMPREHEND_GAMES[] = {
-	{"crimsoncrown", "cc1.gda", "f2abf019675ac5c9bcfd81032bc7787b"},
-	{"ootopos", "g0", "56460c1ee669c253607534155d7e9db4"},
-#ifndef RELEASE_BUILD
-	{"talisman", "g0", "35770d4815e610b5252e3fcd9f11def3"},
-#endif
-	{"transylvania", "tr.gda", "22e08633eea02ceee49b909dfd982d22"},
-#ifndef RELEASE_BUILD
-	{"transylvania", "g0", "384cbf0cd50888310fd33574e6baf880"},
-#endif
+	{ "transylvania", "tr.gda", "22e08633eea02ceee49b909dfd982d22" },
+	{ "crimsoncrown", "cc1.gda", "f2abf019675ac5c9bcfd81032bc7787b" },
+	{ "ootopos", "g0", "56460c1ee669c253607534155d7e9db4" },
+
+	{ "transylvaniav2", "g0", "384cbf0cd50888310fd33574e6baf880" },
+	{ "talisman", "g0", "35770d4815e610b5252e3fcd9f11def3" },
 
 	{nullptr, nullptr, nullptr}
 };


Commit: 2c7d2f135b712be43efe1c95dd27f840da6dcdf3
    https://github.com/scummvm/scummvm/commit/2c7d2f135b712be43efe1c95dd27f840da6dcdf3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-20T11:10:00-08:00

Commit Message:
GLK: GLULX: Mark games for testing

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


diff --git a/engines/glk/glulx/detection.cpp b/engines/glk/glulx/detection.cpp
index 7ed013b3ba..1e3995deb6 100644
--- a/engines/glk/glulx/detection.cpp
+++ b/engines/glk/glulx/detection.cpp
@@ -41,7 +41,7 @@ GameDescriptor GlulxMetaEngine::findGame(const char *gameId) {
 	for (const PlainGameDescriptor *pd = GLULXE_GAME_LIST; pd->gameId; ++pd) {
 		if (!strcmp(gameId, pd->gameId)) {
 			GameDescriptor gd = *pd;
-			gd._supportLevel = kUnstableGame;
+			gd._supportLevel = kTestingGame;
 			return gd;
 		}
 	}