DIRECTOR: Shorted detection tables

1 files changed, 38 insertions, 372 deletions

diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 06e69c1c48..798326b7f4 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -25,6 +25,13 @@
 
 namespace Director {
 
+#define GENGAME_(t,e,f,m,s,l,p,fl,v) 	{ { t, e, AD_ENTRY1s(f, m, s), l, p, fl, GUIO1(GUIO_NOASPECT) }, GID_GENERIC, v }
+
+#define MACGAME(t,e,f,m,s,v) 	GENGAME_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
+#define WINGAME(t,e,f,m,s,v) 	GENGAME_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
+#define MACDEMO(t,e,f,m,s,v) 	GENGAME_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,(ADGF_MACRESFORK|ADGF_DEMO),v)
+#define WINDEMO(t,e,f,m,s,v) 	GENGAME_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_DEMO,v)
+
 static const DirectorGameDescription gameDescriptions[] = {
 	{
 		{
@@ -40,227 +47,32 @@ static const DirectorGameDescription gameDescriptions[] = {
 		3
 	},
 
-	{ // Generic D3 Mac entry
-		{
-			"director",
-			"",
-			AD_ENTRY1("D3-mac", 0),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-	{ // Generic D4 Mac entry
-		{
-			"director",
-			"",
-			AD_ENTRY1("D4-mac", 0),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
-	{
-		{
-			"theapartment",
-			"D2",
-			AD_ENTRY1s("Main Menu", "fc56c179cb8c6d4938e61ee61fd0032c", 48325),	// Original name is "•Main Menu"
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		2
-	},
-	{
-		{
-			"theapartment",
-			"D3",
-			AD_ENTRY1s("Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911),	// Original name is "•Main Menu"
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-	{
-		{
-			"theapartment",
-			"D4",
-			AD_ENTRY1s("Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612),// Original name is "•Main Menu"
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	// Generic D3 Mac entry
+	MACGAME("director", "", "D3-mac", 0, -1, 3),
+	// Generic D4 Mac entry
+	MACGAME("director", "", "D4-mac", 0, -1, 4),
 
-	{
-		{
-			"gundam0079",
-			"",
-			AD_ENTRY1("Gundam0079.exe", "1a7acbba10a7246ba58c1d53fc7203f5"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
+	MACGAME("theapartment", "D2", "Main Menu", "fc56c179cb8c6d4938e61ee61fd0032c", 48325, 2), // Original name is "•Main Menu"
+	MACGAME("theapartment", "D3", "Main Menu", "9e838fe1a6af7992d656ca325e38dee5", 47911, 3), // Original name is "•Main Menu"
+	MACGAME("theapartment", "D4", "Main Menu", "ff86181f03fe6eb060f65a985ca0580d", 160612, 4), // Original name is "•Main Menu"
 
-	{
-		{
-			"gundam0079",
-			"",
-			AD_ENTRY1("Gundam0079", "4c38a51a21a1ad231f218c4786ff771d"),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
+	WINGAME("gundam0079", "", "Gundam0079.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
+	MACGAME("gundam0079", "", "Gundam0079", "4c38a51a21a1ad231f218c4786ff771d", -1, 5),
 
-	{
-		{
-			"jewels",
-			"",
-			AD_ENTRY1("JEWELS.EXE", "bb6d81471d166088260090472c6c3a87"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
-
-	{
-		{
-			"jewels",
-			"",
-			AD_ENTRY1("Jewels.exe", "c1a2e8b7e41fa204009324a9c7db1030"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		7
-	},
-
-	{
-		{
-			"jewels",
-			"Two-Minute Demo",
-			AD_ENTRY1("DEMO.EXE", "ebee52d3c4280674c600177df5b09da0"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	WINGAME("jewels", "", "JEWELS.EXE", "bb6d81471d166088260090472c6c3a87", -1, 4),
+	WINGAME("jewels", "", "Jewels.exe", "c1a2e8b7e41fa204009324a9c7db1030", -1, 7),
+	WINDEMO("jewels", "Two-Minute Demo", "DEMO.EXE", "ebee52d3c4280674c600177df5b09da0", -1, 4),
 
 	// Note: There are four versions of the binary included on the disc.
 	// 5.6, 6, and 9 Meg variants all exist too.
-	{
-		{
-			"jewels",
-			"",
-			AD_ENTRY1("Jewels 11 Meg", "339c89a148c4ff2c5c815c62ac006325"),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
-
-	{
-		{
-			"jewels",
-			"Two-Minute Demo",
-			AD_ENTRY1("Two-Minute Demo", "01be45e7241194dad07938e7059b88e3"),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK | ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
-
-	{
-		{
-			"jewels",
-			"",
-			AD_ENTRY1("Jewels of the Oracle", "fa52f0136cde568a46249ce74f01a324"),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		7
-	},
-
-	{
-		{
-			"jewels",
-			"Demo",
-			AD_ENTRY1("JEWELS.EXE", "abcc448c035e88d4edb4a29034fd1e34"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS | ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	MACGAME("jewels", "", "Jewels 11 Meg", "339c89a148c4ff2c5c815c62ac006325", -1, 4),
+	MACDEMO("jewels", "Two-Minute Demo", "Two-Minute Demo", "01be45e7241194dad07938e7059b88e3", -1, 4),
 
-	{
-		{
-			"jman",
-			"",
-			AD_ENTRY1s("JMAN.EXE", "7c8230a804abf9353b05627a675b5ffb", 375282),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	MACGAME("jewels", "", "Jewels of the Oracle", "fa52f0136cde568a46249ce74f01a324", -1, 7),
+	WINDEMO("jewels", "Demo", "JEWELS.EXE", "abcc448c035e88d4edb4a29034fd1e34", -1, 4),
 
-	{
-		{
-			"jman",
-			"",
-			AD_ENTRY1s("JMDEMO.EXE", "7c8230a804abf9353b05627a675b5ffb", 375305),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	WINGAME("jman", "", "JMAN.EXE", "7c8230a804abf9353b05627a675b5ffb", 375282, 3),
+	WINDEMO("jman", "", "JMDEMO.EXE", "7c8230a804abf9353b05627a675b5ffb", 375305, 3),
 
 	{
 		{
@@ -276,47 +88,12 @@ static const DirectorGameDescription gameDescriptions[] = {
 		3
 	},
 
-	{
-		{
-			"jman",
-			"Turbo!",
-			AD_ENTRY1("JMP Turbo\xE2\x84\xA2", "cc3321069072b90f091f220bba16e4d4"), // Trademark symbol (UTF-8)
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	MACGAME("jman", "Turbo!", "JMP Turbo\xE2\x84\xA2", "cc3321069072b90f091f220bba16e4d4", -1, 4), // Trademark symbol (UTF-8)
 
-	{
-		{
-			"majestic",
-			"",
-			AD_ENTRY1("MAJESTIC.EXE", "624267f70253e5327981003a6fc0aeba"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	WINGAME("majestic", "", "MAJESTIC.EXE", "624267f70253e5327981003a6fc0aeba", -1, 4),
 
-	{ // Meet Mediaband
-		{
-			"mediaband",
-			"",
-			AD_ENTRY1s("MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	// Meet Mediaband
+	WINGAME("mediaband", "", "MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921, 4),
 
 	{
 		{
@@ -401,131 +178,20 @@ static const DirectorGameDescription gameDescriptions[] = {
 		5
 	},
 
-	{
-		{
-			"spyclub",
-			"",
-			AD_ENTRY1("SPYCLUB.EXE", "65d06b5fef155a2473434571aff5bc29"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	WINGAME("spyclub", "", "SPYCLUB.EXE", "65d06b5fef155a2473434571aff5bc29", -1, 3),
 
-	{
-		{
-			"amber",
-			"",
-			AD_ENTRY1("amber_jb.exe", "1a7acbba10a7246ba58c1d53fc7203f5"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
+	WINGAME("amber", "", "amber_jb.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
 
-	{
-		{
-			"vvvampire",
-			"",
-			AD_ENTRY1("VAMPIRE.EXE", "88f4f7406f34ec36e751a64f7c76f2c4"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	WINGAME("vvvampire", "", "VAMPIRE.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", -1, 3),
+	MACGAME("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
 
-	{
-		{
-			"vvvampire",
-			"",
-			AD_ENTRY1("The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e"),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	WINGAME("vvdinosaur", "", "DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76", -1, 3),
+	MACGAME("vvdinosaur", "", "Start Game", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
 
-	{
-		{
-			"vvdinosaur",
-			"",
-			AD_ENTRY1("DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76"),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	MACGAME("warlock", "", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271107, 2),
+	WINGAME("warlock", "", "SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867, 2),
 
-	{
-		{
-			"vvdinosaur",
-			"",
-			AD_ENTRY1("Start Game", "d41d8cd98f00b204e9800998ecf8427e"),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"warlock",
-			"",
-			AD_ENTRY1s("Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271107),
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		2
-	},
-
-	{
-		{
-			"warlock",
-			"",
-			AD_ENTRY1s("SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		2
-	},
-
-	{
-		{
-			"warlock",
-			"",
-			AD_ENTRY1s("SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		2
-	},
+	WINDEMO("warlock", "", "SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934, 2),
 
 	{
 		{