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

[sev-]

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

Summary:
9051256282 GLK: ADRIFT - Move known v5 game to unsupported list
bc7cd29b36 GLK: ADRIFT - Add more known v5 games to their respective lists


Commit: 9051256282ac7c54c7cf150543a1ff990936cbf1
    https://github.com/scummvm/scummvm/commit/9051256282ac7c54c7cf150543a1ff990936cbf1
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-08-19T12:32:40+02:00

Commit Message:
GLK: ADRIFT - Move known v5 game to unsupported list

If this is wrong, please tell and reject

Changed paths:
    engines/glk/adrift/detection_tables.h


diff --git a/engines/glk/adrift/detection_tables.h b/engines/glk/adrift/detection_tables.h
index f018d6847b..f06b05e236 100644
--- a/engines/glk/adrift/detection_tables.h
+++ b/engines/glk/adrift/detection_tables.h
@@ -185,7 +185,6 @@ const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
 	{ "amcdiarystrip", "Diary of a Stripper" },
 
 	// ADRIFT One-Hour Game Competition 1
-	{ "1hgamonkeytoomany", "A Monkey too many" }, // ADRIFT 5 game
 	{ "1hgprincess1", "The Princess In The Tower" },
 	{ "1hg1hrgame", "A Masochist's Heaven" },
 	{ "1hgendgame", "The Game To End All Games" },
@@ -252,6 +251,7 @@ const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
 };
 
 const PlainGameDescriptor ADRIFT5_GAME_LIST[] = {
+	{ "1hgamonkeytoomany", "A Monkey too many" },
 	{ "axeofkolt", "The Axe of Kolt" },
 	{ "castlecoris", "The Spectre of Castle Coris" },
 	{ "fistoffire", "Die Feuerfaust - The Fist of Fire" },
@@ -391,6 +391,7 @@ const GlkDetectionEntry ADRIFT_GAMES[] = {
 
 #ifndef RELEASE_BUILD
 	// Unsupported English ADRIFT 5 games
+	DT_ENTRY0("1hgamonkeytoomany", "c9d719261d0f760f95685899aa80bbf5", 5016),
 	DT_ENTRY0("axeofkolt", "353a29250cc5e463876350e3d232fd22", 931390),
 	DT_ENTRY0("castlecoris", "15f21891cf889e24d21f644b07d249ce", 573856),
 	DT_ENTRY0("fistoffire", "3b76af72ce4876dfea4da23ab0b7f641", 567450),
@@ -445,7 +446,6 @@ const GlkDetectionEntry ADRIFT_GAMES[] = {
 	DT_ENTRY0("amcdiarystrip", "0e04238a2b49220c284ce9c8723abd77", 43334),
 
 	// ADRIFT One-Hour Game Competition 1
-	DT_ENTRY0("1hgamonkeytoomany", "c9d719261d0f760f95685899aa80bbf5", 5016),
 	DT_ENTRY0("1hgprincess1", "d745a3f2c4dc40fb10f25d1539a2a1e7", 7181),
 	DT_ENTRY0("1hg1hrgame", "63e9594bf2b4e7cf5bf75dd9cc1353dc", 2978),
 	DT_ENTRY0("1hgendgame", "6036e5654786f841ca59f8f7e95276be", 4063),


Commit: bc7cd29b366cf1766ab1e025165edfbc019d2ab3
    https://github.com/scummvm/scummvm/commit/bc7cd29b366cf1766ab1e025165edfbc019d2ab3
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-08-19T12:32:40+02:00

Commit Message:
GLK: ADRIFT - Add more known v5 games to their respective lists

Changed paths:
    engines/glk/adrift/detection_tables.h


diff --git a/engines/glk/adrift/detection_tables.h b/engines/glk/adrift/detection_tables.h
index f06b05e236..77a4649d7b 100644
--- a/engines/glk/adrift/detection_tables.h
+++ b/engines/glk/adrift/detection_tables.h
@@ -251,7 +251,6 @@ const PlainGameDescriptor ADRIFT_GAME_LIST[] = {
 };
 
 const PlainGameDescriptor ADRIFT5_GAME_LIST[] = {
-	{ "1hgamonkeytoomany", "A Monkey too many" },
 	{ "axeofkolt", "The Axe of Kolt" },
 	{ "castlecoris", "The Spectre of Castle Coris" },
 	{ "fistoffire", "Die Feuerfaust - The Fist of Fire" },
@@ -259,6 +258,16 @@ const PlainGameDescriptor ADRIFT5_GAME_LIST[] = {
 	{ "starshipquest", "Starship Quest" },
 	{ "sixsilverbullets", "Six Silver Bullets" },
 	{ "tingalan", "Tingalan" },
+	// ADRIFT One-Hour Game Competition 1
+	{ "1hgamonkeytoomany", "A Monkey too many" },
+	// English Blorb Games
+	{ "spacedetective1", "Space Detective, episode 1" },
+	{ "spacedetective2", "Space Detective, episode 2" },
+	{ "spacedetective3", "Space Detective, episode 3" },
+	{ "spacedetective4", "Space Detective, episode 4" },
+	{ "spacedetective5", "Space Detective, episode 5" },
+	{ "spacedetective6", "Space Detective, episode 6" },
+	{ "spacedetective7", "Space Detective, episode 7" },
 
 	{ nullptr, nullptr }
 };
@@ -381,13 +390,6 @@ const GlkDetectionEntry ADRIFT_GAMES[] = {
 	DT_ENTRY0("noblecrook3", "c9d4a1ba7d5c1625f2d4cad0f067275a", 22088),
 	DT_ENTRY0("noblecrook4", "cb26241f8dba982bb0cd357ebd8fac45", 20606),
 	DT_ENTRY0("sonofcamelot", "7b3e9e45edc75202b3f586d0ca8dddde", 474380),
-	DT_ENTRY0("spacedetective1", "170517dae3a195f37d876f5645637953", 34044),
-	DT_ENTRY0("spacedetective2", "1e12b19d8777173cbf9866b3dd2fc2f0", 32632),
-	DT_ENTRY0("spacedetective3", "fc9fb75830d7f59bf932896152b1e759", 30560),
-	DT_ENTRY0("spacedetective4", "86fbcf204c6b0982ef2394a60bb8df3e", 32184),
-	DT_ENTRY0("spacedetective5", "f1bf863cce436a5ef17e64237803571a", 32676),
-	DT_ENTRY0("spacedetective6", "6035c865f7a4831e4539b7a2ff2ab711", 31922),
-	DT_ENTRY0("spacedetective7", "2044086edd9b2288ff2279b3824dfcef", 30066),
 
 #ifndef RELEASE_BUILD
 	// Unsupported English ADRIFT 5 games
@@ -399,6 +401,14 @@ const GlkDetectionEntry ADRIFT_GAMES[] = {
 	DT_ENTRY0("starshipquest", "02fb2460c61c8d82c31fa1d763e63a7e", 449736),
 	DT_ENTRY0("sixsilverbullets", "e0f6170b5cbde7005609e68d8a25ddd3", 376934),
 	DT_ENTRY0("tingalan", "08c9ecd86664b62335d3852a2bb3d201", 259969026),
+	// English Blorb games
+	DT_ENTRY0("spacedetective1", "170517dae3a195f37d876f5645637953", 34044),
+	DT_ENTRY0("spacedetective2", "1e12b19d8777173cbf9866b3dd2fc2f0", 32632),
+	DT_ENTRY0("spacedetective3", "fc9fb75830d7f59bf932896152b1e759", 30560),
+	DT_ENTRY0("spacedetective4", "86fbcf204c6b0982ef2394a60bb8df3e", 32184),
+	DT_ENTRY0("spacedetective5", "f1bf863cce436a5ef17e64237803571a", 32676),
+	DT_ENTRY0("spacedetective6", "6035c865f7a4831e4539b7a2ff2ab711", 31922),
+	DT_ENTRY0("spacedetective7", "2044086edd9b2288ff2279b3824dfcef", 30066),
 #endif
 
 	// Italian Games