GLK: Detect game Id clashes across different sub-engines

1 files changed, 31 insertions, 37 deletions

diff --git a/engines/glk/frotz/detection_tables.h b/engines/glk/frotz/detection_tables.h
index 5d3fa77694..77e673923e 100644
--- a/engines/glk/frotz/detection_tables.h
+++ b/engines/glk/frotz/detection_tables.h
@@ -83,26 +83,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "zork3", "Zork III: The Dungeon Master" },
 	{ "ztuu", "Zork: The Undiscovered Underground" },
 
-	// Converted Scott Adams games
-	{ "adventureland",     "Adventureland" },
-	{ "pirateadventure",   "Pirate Adventure" },
-	{ "missionimpossible", "Mission Impossible" },
-	{ "voodoocastle",      "Voodoo Castle" },
-	{ "thecount",          "The Count" },
-	{ "strangeodyssey",    "Strange Odyssey" },
-	{ "mysteryfunhouse",   "Mystery Fun House" },
-	{ "pyramidofdoom",     "Pyramid Of Doom" },
-	{ "ghosttown",         "Ghost Town" },
-	{ "savageisland1",     "Savage Island, Part 1" },
-	{ "savageisland2",     "Savage Island, Part 2" },
-	{ "goldenvoyage",      "The Golden Voyage" },
-	{ "adventure13",       "Adventure 13" },
-	{ "adventure14",       "Adventure 14" },
-	{ "buckaroobanzai",    "Buckaroo Banzai" },
-	{ "marveladventure",   "Marvel Adventure #1" },
-	{ "questprobe2",       "Questprobe 2: Spiderman" },
-	{ "scottsampler",      "Adventure International's Mini-Adventure Sampler" },
-
 	// English games
 	{ "404life",           "404 - Life not found" },
 	{ "69105keys",         "69,105 Keys" },
@@ -787,7 +767,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "zsnake",            "Z-Snake" },
 	{ "ztornado",          "Z-Tornado" },
 	{ "ztrek",             "Super Z Trek" },
-	{ "ztuu",              "Zork: The Undiscovered Underground" },
 	{ "zugzwang",          "Zugzwang: The Interactive Life of a Chess Piece" },
 
 	// Painfull Little Stupid Games
@@ -802,18 +781,38 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "plsg9",             "Zork LXIX: Painless Little Stupid Games #9" },
 	{ "plsg10",            "The Valley House: Painless Little Stupid Games #10" },
 
+	// Converted Scott Adams games
+	{ "adventurelandi5",     "Adventureland" },
+	{ "pirateadventurei5",   "Pirate Adventure" },
+	{ "missionimpossiblei5", "Mission Impossible" },
+	{ "voodoocastlei5",      "Voodoo Castle" },
+	{ "thecounti5",          "The Count" },
+	{ "strangeodysseyi5",    "Strange Odyssey" },
+	{ "mysteryfunhousei5",   "Mystery Fun House" },
+	{ "pyramidofdoomi5",     "Pyramid Of Doom" },
+	{ "ghosttowni5",         "Ghost Town" },
+	{ "savageisland1i5",     "Savage Island, Part 1" },
+	{ "savageisland2i5",     "Savage Island, Part 2" },
+	{ "goldenvoyagei5",      "The Golden Voyage" },
+	{ "adventure13i5",       "Adventure 13" },
+	{ "adventure14i5",       "Adventure 14" },
+	{ "buckaroobanzaii5",    "Buckaroo Banzai" },
+	{ "marveladventurei5",   "Marvel Adventure #1" },
+	{ "questprobe2i5",       "Questprobe 2: Spiderman" },
+	{ "scottsampleri5",      "Adventure International's Mini-Adventure Sampler" },
+
 	// Mysterious Adventures by Brian Howarth
-	{ "goldenbaton", "Mysterious Adventures 1: The Golden Baton" },
-	{ "timemachine", "Mysterious Adventures 2: The Time Machine" },
-	{ "arrowofdeath1", "Mysterious Adventures 3: Arrow of Death Part 1" },
-	{ "arrowofdeath2", "Mysterious Adventures 4: Arrow of Death Part 2" },
-	{ "pulsar7", "Mysterious Adventures 5: Escape from Pulsar 7" },
-	{ "circus", "Mysterious Adventures 6: Circus" },
-	{ "feasibility", "Mysterious Adventures 7: Feasibility Experiment" },
-	{ "akyrz", "Mysterious Adventures 8: The Wizard of Akyrz" },
-	{ "perseus", "Mysterious Adventures 9: Perseus and Andromeda" },
-	{ "10indians", "Mysterious Adventures 10: Ten Little Indians" },
-	{ "waxworks", "Mysterious Adventures 11: Waxworks" },
+	{ "goldenbatoni5", "Mysterious Adventures 1: The Golden Baton" },
+	{ "timemachinei5", "Mysterious Adventures 2: The Time Machine" },
+	{ "arrowofdeath1i5", "Mysterious Adventures 3: Arrow of Death Part 1" },
+	{ "arrowofdeath2i5", "Mysterious Adventures 4: Arrow of Death Part 2" },
+	{ "pulsar7i5", "Mysterious Adventures 5: Escape from Pulsar 7" },
+	{ "circusi5", "Mysterious Adventures 6: Circus" },
+	{ "feasibilityi5", "Mysterious Adventures 7: Feasibility Experiment" },
+	{ "akyrzi5", "Mysterious Adventures 8: The Wizard of Akyrz" },
+	{ "perseusi5", "Mysterious Adventures 9: Perseus and Andromeda" },
+	{ "10indiansi5", "Mysterious Adventures 10: Ten Little Indians" },
+	{ "waxworksi5", "Mysterious Adventures 11: Waxworks" },
 
 	// 1992 album Apollo 18, by They Might be Giants
 	{ "apollo1", "Apollo 18 01: Dig My Grave" },
@@ -897,7 +896,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "ayon", "Nel Mondo di Ayon" },
 	{ "darkiss", "Darkiss! Il bacio del vampiro" },
 	{ "darkiss2", "Darkiss! Il bacio del vampiro. Capitolo 2" },
-	{ "enigma", "Enigma" },
 	{ "filamit", "Filaments" },
 	{ "flamel", "Flamel" },
 	{ "giardino", "Il giardino incantato" },
@@ -905,7 +903,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "koohinoor", "Kooh-I-Noor" },
 	{ "luna", "La Pietra della Luna" },
 	{ "poesia", "Manca solo un verso a quella poesia" },
-	{ "poesia", "Manca solo un verso a quella poesia" },
 	{ "oldwest1", "Pecos Town, Old West Episode I" },
 	{ "rovo", "Il rovo" },
 	{ "scarafaggio", "Lo Scarafaggio" },
@@ -926,7 +923,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "absolutos", "Los sonidos absolutos" },
 	{ "afuera", "Afuera" },
 	{ "amanda", "Amanda" },
-	{ "amanda", "Amanda" },
 	{ "aque1", "Aquelarre" },
 	{ "casi", "Casi Muerto" },
 	{ "Celos", "Un Asunto de Celos" },
@@ -954,7 +950,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "kunelar", "El ascenso de Kunelar" },
 	{ "lamansion", "La Mansion" },
 	{ "lldc", "La Llamada de Cthulhu" },
-	{ "megara", "Los placeres de Megara" },
 	{ "macetas", "Macetas" },
 	{ "meeva", "La mediana evasion" },
 	{ "megara", "Los placeres de Megara" },
@@ -977,7 +972,6 @@ const PlainGameDescriptor FROTZ_GAME_LIST[] = {
 	{ "sombras", "Sombras de Moria" },
 	{ "tokland", "La isla de Tokland" },
 	{ "torre", "Misterio en la torre" },
-	{ "tuuli", "Tuuli" },
 
 	// Swedish games
 	{ "aventyr", "Aventyr" },