HOPKINS: Update detection to avoid as much as possible the use of executables

2 files changed, 27 insertions, 108 deletions

diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index a42597415b..9d16b0ab51 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -67,6 +67,7 @@ static const PlainGameDescriptor hopkinsGames[] = {
 
 const static char *directoryGlobs[] = {
 	"voice",
+	"link",
 	0
 };
 
diff --git a/engines/hopkins/detection_tables.h b/engines/hopkins/detection_tables.h
index 3e04375fe9..c3ff563f6f 100644
--- a/engines/hopkins/detection_tables.h
+++ b/engines/hopkins/detection_tables.h
@@ -24,12 +24,11 @@ namespace Hopkins {
 
 static const HopkinsGameDescription gameDescriptions[] = {
 	{
-		// Hopkins FBI Linux Demo 1.00
+		// Hopkins FBI Linux Demo UK 1.00 and 1.02
 		{
 			"hopkins",
-			"Linux Demo v1.00",
+			"Linux Demo",
 			{
-				{"Hopkins-PDemo.bin", 0, "88b4d6e14b9b1407083cb3d1213c0fa7", 272027},
 				{"RES_VAN.RES", 0, "29414c05be8f9fe794c61572a65def12", 16060544},
 				AD_LISTEND
 			},
@@ -39,32 +38,14 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			GUIO1(GUIO_NONE)
 		},
 	},
-
-	{
-		// Hopkins FBI Linux Demo 1.02
-		{
-			"hopkins",
-			"Linux Demo v1.02",
-			{
-				{"Hopkins-PDemo.bin", 0, "f82f4e698f3a189419351be0de2b2f8e", 273760},
-				{"RES_VAN.RES", 0, "29414c05be8f9fe794c61572a65def12", 16060544},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformLinux,
-			ADGF_DEMO,
-			GUIO1(GUIO_NONE)
-		},
-	},
-
 	{
 		// Hopkins FBI OS/2, provided by Strangerke
 		{
 			"hopkins",
 			0,
 			{
-				{"Hopkins.exe", 0, "63d45f882278e5a9fa1027066223e5d9", 292864},
 				{"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
+				{"CREAN.TXT", 0, "e13aa69d9e043f066776e1d0ef98fdf5", 1871},
 				AD_LISTEND
 			},
 			Common::EN_ANY,
@@ -74,93 +55,41 @@ static const HopkinsGameDescription gameDescriptions[] = {
 		},
 	},
 	{
-		// Hopkins FBI Win95 Demo, provided by Strangerke
-		// CHECKME: No voice! a second file is required though... Also, it has multi-language support
-		{
-			"hopkins",
-			"Win95 Demo",
-			{
-				{"Hopkins.exe", 0, "0c9ebfe371f4dcf84a49f333f04839a0", 376897},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NONE)
-		},
-	},
-	{
-		// Hopkins FBI Win95 Polish Demo, provided by Strangerke
-		{
-			"hopkins",
-			"Win95 Demo",
-			{
-				{"Hopkins.exe", 0, "7595c0b9374739b212ee9f8f412ac716", 307200},
-				{"RES_VAN.RES", 0, "8262cfba261c200af4451902689dffe0", 12233202},
-				AD_LISTEND
-			},
-			Common::PL_POL,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NONE)
-		},
-	},
-	{
-		// Hopkins FBI Win95 Spanish
-		{
-			"hopkins",
-				0,
-			{
-				{"Hopkins.exe", 0, "31c837378bb2e0b2573befea44956d3f", 421386},
-				{"RES_VES.RES", 0, "77ee08896466ae88cc1af3bf1a0bf78c", 32882302},
-				AD_LISTEND
-			},
-			Common::ES_ESP,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
-		},
-	},
-	{
-		// Hopkins FBI Win95, provided by Strangerke
+		// Hopkins FBI BeOS, provided by Strangerke & Eriktorbjorn
 		{
 			"hopkins",
 			0,
 			{
-				{"Hopkins.exe", 0, "277a5c144bf9ec7d8450ae37afb85090", 419281},
-				{"RES_VAN.RES", 0, "f1693ac0b0859c8ecd8cb30ff43cf55f", 38296346},
+				{"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformWindows,
+			Common::kPlatformBeOS,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
 	},
 	{
-		// Hopkins FBI Win95, provided by alexbevi
-		// Dec 15  1998 hopkins.exe
+		// Hopkins FBI Win95 Spanish
 		{
 			"hopkins",
 			0,
 			{
-				{"Hopkins.exe", 0, "a587762dd50d5933e1c89f9975180764", 378694},
-				{"RES_VAN.RES", 0, "f1693ac0b0859c8ecd8cb30ff43cf55f", 38296346},
+				{"RES_VES.RES", 0, "77ee08896466ae88cc1af3bf1a0bf78c", 32882302},
 				AD_LISTEND
 			},
-			Common::EN_ANY,
+			Common::ES_ESP,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
 	},
 	{
-		// Hopkins FBI Win95 EN, provided by greencis in bug #3612406
+		// Hopkins FBI Win95 UK, provided by Strangerke, alexbevi, greencis
 		{
 			"hopkins",
 			0,
 			{
-				{"hopkins.exe", 0, "020690049fa1dfcd63a18fdafb139a0e", 421386},
 				{"RES_VAN.RES", 0, "f1693ac0b0859c8ecd8cb30ff43cf55f", 38296346},
 				AD_LISTEND
 			},
@@ -176,7 +105,6 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			"hopkins",
 			0,
 			{
-				{"hopkins.exe", 0, "3043fef0bd3bfeba8252647cd090ce09", 419281},
 				{"res_van.res", 0, "bf17c710e184a25a6c8e9d1d9503c38e", 32197685},
 				AD_LISTEND
 			},
@@ -192,7 +120,6 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			"hopkins",
 			0,
 			{
-				{"Hopkins.bin", 0, "71611380cb31744bf909b8319a65e6e6", 275844},
 				{"RES_VFR.RES", 0, "0490d4d1aa71075ebf71cc79e5dc7894", 39817945},
 				AD_LISTEND
 			},
@@ -208,7 +135,6 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			"hopkins",
 			0,
 			{
-				{"Hopkins.bin", 0, "71611380cb31744bf909b8319a65e6e6", 275844},
 				{"RES_VAN.RES", 0, "29414c05be8f9fe794c61572a65def12", 38832455},
 				AD_LISTEND
 			},
@@ -218,61 +144,53 @@ static const HopkinsGameDescription gameDescriptions[] = {
 			GUIO1(GUIO_NONE)
 		},
 	},
-
 	{
-		// Hopkins FBI BeOS, provided by Strangerke
+		// Hopkins FBI Win95, French, provided by SylvainTV
 		{
 			"hopkins",
 			0,
 			{
-				{"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
-				{"Hopkins_ FBI", 0, "8940ce2e618c42691b66aad5d6c223b0", 757936},
+				{"RES_VFR.RES", 0, "b8a3849063c9eeefe80e82cfce1ad3cd", 39269361},
 				AD_LISTEND
 			},
-			Common::EN_ANY,
-			Common::kPlatformBeOS,
+			Common::FR_FRA,
+			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NONE)
 		},
-	},
 
+	},
 	{
-		// Hopkins FBI BeOS, uninstalled, provided by eriktorbjorn
+		// Hopkins FBI Win95 Demo, provided by Strangerke
+		// CHECKME: No voice! a second file is required though... Also, it has multi-language support
 		{
 			"hopkins",
-			0,
+			"Win95 Demo",
 			{
-				{"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
-				{"Hopkins.pkg", 0, "72f97806dd3d5fc0c0eb24196f180618", 285017},
+				{"Hopkins.exe", 0, "0c9ebfe371f4dcf84a49f333f04839a0", 376897},
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformBeOS,
-			ADGF_NO_FLAGS,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
 			GUIO1(GUIO_NONE)
 		},
-
 	},
-
 	{
-		// Hopkins FBI Win32, French uninstalled, provided by SylvainTV
+		// Hopkins FBI Win95 Polish Demo, provided by Strangerke
 		{
 			"hopkins",
-				0,
+			"Win95 Demo",
 			{
-				{"Hopkins.exe", 0, "277a5c144bf9ec7d8450ae37afb85090", 419281},
-				{"RES_VFR.RES", 0, "b8a3849063c9eeefe80e82cfce1ad3cd", 39269361},
+				{"RES_VAN.RES", 0, "8262cfba261c200af4451902689dffe0", 12233202},
 				AD_LISTEND
 			},
-			Common::FR_FRA,
+			Common::PL_POL,
 			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
+			ADGF_DEMO,
 			GUIO1(GUIO_NONE)
 		},
-
 	},
-
-
 	{ AD_TABLE_END_MARKER }
 };