Rearranged detection table and clarified some entries.

svn-id: r25293

1 files changed, 400 insertions, 78 deletions

diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index ad765f2302..fec355e798 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -45,10 +45,14 @@ using namespace Common;
 static const PlainGameDescriptor gobGames[] = {
 	{"gob", "Gob engine game"},
 	{"gob1", "Gobliiins"},
+	{"gob1-demo", "Gobliiins Demo"},
 	{"gob2", "Gobliins 2"},
+	{"gob2-demo", "Gobliins 2 Demo"},
 	{"gob3", "Goblins Quest 3"},
+	{"gob3-demo", "Goblins Quest 3 Demo"},
 	{"bargon", "Bargon Attack"},
 	{"ween", "Ween: The Prohpecy"},
+	{"ween-demo", "Ween: The Prohpecy Demo"},
 	{"woodruff", "The Bizarre Adventures of Woodruff and the Schnibble"},
 	{0, 0}
 };
@@ -61,85 +65,403 @@ static const ADObsoleteGameID obsoleteGameIDsTable[] = {
 
 namespace Gob {
 
-#define ENTRY(id,extra,flags,lang,platform,md5,tot) \
-	{ \
-		{ \
-			id, \
-			extra, \
-			AD_ENTRY1("intro.stk", md5), \
-			lang, \
-			platform, \
-		}, \
-		flags, \
-		tot \
-	}
-
 static const GOBGameDescription gameDescriptions[] = {
-	// Supplied by Florian Zeitz on scummvm-devel
-	ENTRY("gob1", "EGA", GF_GOB1 | GF_EGA, UNK_LANG, kPlatformPC, "c65e9cc8ba23a38456242e1f2b1caad4", "intro"),
-	ENTRY("gob1", "EGA", GF_GOB1 | GF_EGA, RU_RUS, kPlatformPC, "f9233283a0be2464248d83e14b95f09c", "intro"),
-	//{"gob1", "Gobliiins (Windows)", GF_GOB1, UNK_LANG, "8a5e850c49d7cacdba5f5eb1fcc77b89", "intro"},
-
-	// Supplied by Theruler76 in bug report #1201233
-	ENTRY("gob1", "VGA", GF_GOB1, UNK_LANG, kPlatformPC, "26a9118c0770fa5ac93a9626761600b2", "intro"),
-
-	// CD 1.000 version. Multilingual
-	ENTRY("gob1", "CD 1.000", GF_GOB1 | GF_CD, UNK_LANG, kPlatformPC, "2fbf4b5b82bbaee87eb45d4404c28998", "intro"),
-	// CD 1.02 version. Multilingual
-	ENTRY("gob1", "CD 1.02", GF_GOB1 | GF_CD, UNK_LANG, kPlatformPC, "8bd873137b6831c896ee8ad217a6a398", "intro"),
-
-	ENTRY("gob1", "", GF_GOB1 | GF_AMIGA, UNK_LANG, kPlatformAmiga, "972f22c6ff8144a6636423f0354ca549", "intro"),
-
-	ENTRY("gob1", "Interactive Demo", GF_GOB1, UNK_LANG, kPlatformPC, "e72bd1e3828c7dec4c8a3e58c48bdfdb", "intro"),
-	
-	ENTRY("gob1", "", GF_GOB1 | GF_MAC, UNK_LANG, kPlatformMacintosh, "00a42a7d2d22e6b6ab1b8c673c4ed267", "intro"),
-
-	ENTRY("gob2", "", GF_GOB2, FR_FRA, kPlatformPC, "a13ecb4f6d8fd881ebbcc02e45cb5475", "intro"),
-	ENTRY("gob2", "", GF_GOB2, EN_GRB, kPlatformPC, "b45b984ee8017efd6ea965b9becd4d66", "intro"),
-	ENTRY("gob2", "", GF_GOB2, EN_USA, kPlatformPC, "dedb5d31d8c8050a8cf77abedcc53dae", "intro"),
-	ENTRY("gob2", "", GF_GOB2, DE_DEU, kPlatformPC, "a13892cdf4badda85a6f6fb47603a128", "intro"),
-	ENTRY("gob2", "", GF_GOB2, RU_RUS, kPlatformPC, "cd3e1df8b273636ee32e34b7064f50e8", "intro"),
-
-	ENTRY("gob2", "", GF_GOB2 | GF_AMIGA, DE_DEU, kPlatformAmiga, "d28b9e9b41f31acfa58dcd12406c7b2c", "intro"),
-
-	// Supplied by blackwhiteeagle in bug report #1605235
-	ENTRY("gob2", "", GF_GOB2, DE_DEU, kPlatformPC, "3e4e7db0d201587dd2df4003b2993ef6", "intro"),
-
-	// CD 1.000.
-	ENTRY("gob2", "CD 1.000", GF_GOB2 | GF_CD, EN_USA, kPlatformPC, "9de5fbb41cf97182109e5fecc9d90347", "intro"),
-	// CD 1.01
-	ENTRY("gob2", "CD 1.02", GF_GOB2 | GF_CD, UNK_LANG, kPlatformPC, "24a6b32757752ccb1917ce92fd7c2a04", "intro"),
-
-	ENTRY("gob2", "Demo", GF_GOB2, UNK_LANG, kPlatformPC, "8b1c98ff2ab2e14f47a1b891e9b92217", "usa"),
-	ENTRY("gob2", "Interactive Demo", GF_GOB2, UNK_LANG, kPlatformPC, "cf1c95b2939bd8ff58a25c756cb6125e", "intro"),
-	ENTRY("gob2", "Interactive Demo", GF_GOB2 | GF_AMIGA, UNK_LANG, kPlatformPC, "4b278c2678ea01383fd5ca114d947eea", "intro"),
-
-	ENTRY("ween", "", GF_GOB2, UNK_LANG, kPlatformPC, "2bb8878a8042244dd2b96ff682381baa", "intro"),
-	ENTRY("ween", "", GF_GOB2, UNK_LANG, kPlatformPC, "4b10525a3782aa7ecd9d833b5c1d308b", "intro"),
-	ENTRY("ween", "Demo", GF_GOB2, UNK_LANG, kPlatformPC, "2e9c2898f6bf206ede801e3b2e7ee428", "intro"),
-
-	ENTRY("bargon", "", GF_GOB2, UNK_LANG, kPlatformPC, "da3c54be18ab73fbdb32db24624a9c23", "intro"),
-
-	ENTRY("gob3", "", GF_GOB2, UNK_LANG, kPlatformPC, "32b0f57f5ae79a9ae97e8011df38af42", "intro"),
-	ENTRY("gob3", "", GF_GOB2, UNK_LANG, kPlatformPC, "1e2f64ec8dfa89f42ee49936a27e66e7", "intro"),
-	ENTRY("gob3", "", GF_GOB2, FR_FRA, kPlatformPC, "e42a4f2337d6549487a80864d7826972", "intro"),
-	ENTRY("gob3", "", GF_GOB2, RU_RUS, kPlatformPC, "4e3af248a48a2321364736afab868527", "intro"),
-	ENTRY("gob3", "", GF_GOB2, UNK_LANG, kPlatformPC, "8d28ce1591b0e9cc79bf41cad0fc4c9c", "intro"),
-	// CD 1.000
-	ENTRY("gob3", "CD 1.000", GF_GOB2, UNK_LANG, kPlatformPC, "6f2c226c62dd7ab0ab6f850e89d3fc47", "intro"),
-	// CD 1.02. Spanish "Computer Gaming World"* distribution in Spain
-	ENTRY("gob3", "CD 1.02", GF_GOB2, UNK_LANG, kPlatformPC, "c3e9132ea9dc0fb866b6d60dcda10261", "intro"),
-
-	ENTRY("gob3", "Interactive Demo", GF_GOB2, UNK_LANG, kPlatformPC, "7aebd94e49c2c5c518c9e7b74f25de9d", "intro"),
-	ENTRY("gob3", "Demo", GF_GOB2, UNK_LANG, kPlatformPC, "b9b898fccebe02b69c086052d5024a55", "intro"),
-	ENTRY("gob3", "Interactive Demo 2", GF_GOB2, UNK_LANG, kPlatformPC, "e5dcbc9f6658ebb1e8fe26bc4da0806d", "intro"),
-
-	// CD 1.0
-	ENTRY("woodruff", "1.0", GF_WOODRUFF, UNK_LANG, kPlatformPC, "dccf9d31cb720b34d75487408821b77e", "intro"),
-
-	// CD 1.00, German release (INTRO.STRK seems to be multilingual, though?)
-	ENTRY("woodruff", "1.00", GF_WOODRUFF, UNK_LANG, kPlatformPC, "5f5f4e0a72c33391e67a47674b120cc6", "intro"),
-
+	{ // Supplied by Florian Zeitz on scummvm-devel
+		{
+			"gob1",
+			"EGA",
+			AD_ENTRY1("intro.stk", "c65e9cc8ba23a38456242e1f2b1caad4"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB1 | GF_EGA,
+		"intro"
+	},
+	{
+		{
+			"gob1",
+			"EGA",
+			AD_ENTRY1("intro.stk", "f9233283a0be2464248d83e14b95f09c"),
+			RU_RUS,
+			kPlatformPC,
+		},
+		GF_GOB1 | GF_EGA,
+		"intro"
+	},
+	{ // Supplied by Theruler76 in bug report #1201233
+		{
+			"gob1",
+			"VGA",
+			AD_ENTRY1("intro.stk", "26a9118c0770fa5ac93a9626761600b2"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB1,
+		"intro"
+	},
+	{ // CD 1.000 version. Multilingual
+		{
+			"gob1",
+			"CD 1.000",
+			AD_ENTRY1("intro.stk", "2fbf4b5b82bbaee87eb45d4404c28998"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB1 | GF_CD,
+		"intro"
+	},
+	{ // CD 1.02 version. Multilingual
+		{
+			"gob1",
+			"CD 1.02",
+			AD_ENTRY1("intro.stk", "8bd873137b6831c896ee8ad217a6a398"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB1 | GF_CD,
+		"intro"
+	},
+	{
+		{
+			"gob1-demo",
+			"Demo",
+			AD_ENTRY1("intro.stk", "972f22c6ff8144a6636423f0354ca549"),
+			UNK_LANG,
+			kPlatformAmiga,
+		},
+		GF_GOB1 | GF_AMIGA,
+		"intro"
+	},
+	{
+		{
+			"gob1-demo",
+			"Interactive Demo",
+			AD_ENTRY1("intro.stk", "e72bd1e3828c7dec4c8a3e58c48bdfdb"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB1,
+		"intro"
+	},
+   	{
+		{
+			"gob1",
+			"",
+			AD_ENTRY1("intro.stk", "00a42a7d2d22e6b6ab1b8c673c4ed267"),
+			UNK_LANG,
+			kPlatformMacintosh,
+		},
+		GF_GOB1 | GF_MAC,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "a13ecb4f6d8fd881ebbcc02e45cb5475"),
+			FR_FRA,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "b45b984ee8017efd6ea965b9becd4d66"),
+			EN_GRB,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "dedb5d31d8c8050a8cf77abedcc53dae"),
+			EN_USA,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "a13892cdf4badda85a6f6fb47603a128"),
+			DE_DEU,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "cd3e1df8b273636ee32e34b7064f50e8"),
+			RU_RUS,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "d28b9e9b41f31acfa58dcd12406c7b2c"),
+			DE_DEU,
+			kPlatformAmiga,
+		},
+		GF_GOB2 | GF_AMIGA,
+		"intro"
+	},
+	{ // Supplied by blackwhiteeagle in bug report #1605235
+		{
+			"gob2",
+			"",
+			AD_ENTRY1("intro.stk", "3e4e7db0d201587dd2df4003b2993ef6"),
+			DE_DEU,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"CD 1.000",
+			AD_ENTRY1("intro.stk", "9de5fbb41cf97182109e5fecc9d90347"),
+			EN_USA,
+			kPlatformPC,
+		},
+		GF_GOB2 | GF_CD,
+		"intro"
+	},
+	{
+		{
+			"gob2",
+			"CD 1.02",
+			AD_ENTRY1("intro.stk", "24a6b32757752ccb1917ce92fd7c2a04"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2 | GF_CD,
+		"intro"
+	},
+	{
+		{
+			"gob2-demo",
+			"Non-Interactive",
+			AD_ENTRY1("intro.stk", "8b1c98ff2ab2e14f47a1b891e9b92217"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"usa"
+	},
+	{
+		{
+			"gob2-demo",
+			"Interactive",
+			AD_ENTRY1("intro.stk", "cf1c95b2939bd8ff58a25c756cb6125e"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob2-demo",
+			"Interactive",
+			AD_ENTRY1("intro.stk", "4b278c2678ea01383fd5ca114d947eea"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2 | GF_AMIGA,
+		"intro"
+	},
+	{
+		{
+			"ween",
+			"",
+			AD_ENTRY1("intro.stk", "2bb8878a8042244dd2b96ff682381baa"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"ween",
+			"",
+			AD_ENTRY1("intro.stk", "4b10525a3782aa7ecd9d833b5c1d308b"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"ween-demo",
+			"",
+			AD_ENTRY1("intro.stk", "2e9c2898f6bf206ede801e3b2e7ee428"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"bargon",
+			"",
+			AD_ENTRY1("intro.stk", "da3c54be18ab73fbdb32db24624a9c23"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"",
+			AD_ENTRY1("intro.stk", "32b0f57f5ae79a9ae97e8011df38af42"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"",
+			AD_ENTRY1("intro.stk", "1e2f64ec8dfa89f42ee49936a27e66e7"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"",
+			AD_ENTRY1("intro.stk", "e42a4f2337d6549487a80864d7826972"),
+			FR_FRA,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"",
+			AD_ENTRY1("intro.stk", "4e3af248a48a2321364736afab868527"),
+			RU_RUS,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"",
+			AD_ENTRY1("intro.stk", "8d28ce1591b0e9cc79bf41cad0fc4c9c"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"CD 1.000",
+			AD_ENTRY1("intro.stk", "6f2c226c62dd7ab0ab6f850e89d3fc47"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3",
+			"CD 1.02",
+			AD_ENTRY1("intro.stk", "c3e9132ea9dc0fb866b6d60dcda10261"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3-demo",
+			"Interactive",
+			AD_ENTRY1("intro.stk", "7aebd94e49c2c5c518c9e7b74f25de9d"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3-demo",
+			"Non-interactive",
+			AD_ENTRY1("intro.stk", "b9b898fccebe02b69c086052d5024a55"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"gob3-demo",
+			"Interactive Demo 2",
+			AD_ENTRY1("intro.stk", "e5dcbc9f6658ebb1e8fe26bc4da0806d"),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_GOB2,
+		"intro"
+	},
+	{
+		{
+			"woodruff",
+			"",
+			AD_ENTRY1s("intro.stk", "dccf9d31cb720b34d75487408821b77e", 20296390),
+			UNK_LANG,
+			kPlatformPC,
+		},
+		GF_WOODRUFF,
+		"intro"
+	},
+	{
+		{
+			"woodruff",
+			"",
+			AD_ENTRY1s("intro.stk", "5f5f4e0a72c33391e67a47674b120cc6", 20296422),
+			DE_DEU,
+			kPlatformPC,
+		},
+		GF_WOODRUFF,
+		"intro"
+	},
 	{ { NULL, NULL, { { NULL, 0, NULL, 0 } }, UNK_LANG, kPlatformUnknown }, 0, NULL }
 };