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

[sev-]

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

Summary:
cef7a85cb1 DIRECTOR: Fix detection version for warlock-win


Commit: cef7a85cb19a26d2d12a37b07045fe3d2808cc2c
    https://github.com/scummvm/scummvm/commit/cef7a85cb19a26d2d12a37b07045fe3d2808cc2c
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2020-06-18T01:55:57+02:00

Commit Message:
DIRECTOR: Fix detection version for warlock-win

Also add a few more D4 targets

Changed paths:
    engines/director/detection.cpp
    engines/director/detection_tables.h


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 3e4e409e39..5f5db4b56c 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -83,6 +83,9 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "alice",				"Alice: An Interactive Museum"},
 	{ "amandastories",		"AmandaStories"},
 	{ "amber",				"AMBER: Journeys Beyond"},
+	{ "ankh1",				"Ankh: Mystery of the Pyramids"},
+	{ "ankh2",				"Ankh 2: Mystery of Tutankhamen"},
+	{ "ankh3",				"Ankh 3"},
 	{ "arcofdoom",			"Arc of Doom"},
 	{ "ataripack",			"Activision's Atari 2600 Action Pack"},
 	{ "badday",				"Bad Day on the Midway"},
@@ -99,6 +102,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "easternmind",		"Eastern Mind: The Lost Souls of Tong Nou"},
 	{ "earthwormjim",		"Earthworm Jim"},
 	{ "ernie",				"Ernie"},
+	{ "frankenstein",		"Frankenstein: Through the Eyes of the Monster"},
 	{ "freakshow",			"Freak Show"},
 	{ "gadget",				"Gadget: Invention, Travel, & Adventure"},
 	{ "gundam0079",			"Gundam 0079: The War for Earth" },
@@ -152,6 +156,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "phantasplanet",		"Phantasmagoria Amusement Planet"},
 	{ "pitfall",			"Pitfall: The Mayan Adventure" },
 	{ "planetarizona",		"Escape from Planet Arizona" },
+	{ "prescue",			"Paradise Rescue" },
 	{ "refixion1",			"Refixion"},
 	{ "refixion2",			"Refixion II: Museum or Hospital"},
 	{ "refixion3",			"Refixion III: The Reindeer Story"},
@@ -167,6 +172,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "teamxtreme1",		"Operation: Weather Disaster" },
 	{ "teamxtreme2",		"Operation: Eco-Nightmare" },
 	{ "the7colors",			"The Seven Colors: Legend of PSY-S City"},
+	{ "totaldistortion",	"Total Distortion"},
 	{ "trekborg",			"Star Trek: Borg"},
 	{ "trekguideds9",		"Star Trek: Deep Space Nine Episode Guide"},
 	{ "trekguidetng",		"Star Trek: The Next Generation Episode Guide"},
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 0c72aee557..dafbef785c 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -102,8 +102,6 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME("warlock", "v1.0", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271093, 2),
 	MACGAME("warlock", "v1.1.1", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271107, 2),
 	MACDEMO("warlock", "Demo", "Spaceship Warlock Demo", "cfa68a1bc49251497ebde18e5fc9c217", 271099, 2),
-	WINGAME("warlock", "", "SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867, 2),
-	WINDEMO("warlock", "", "SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934, 2),
 
 ////////////////////////////////////////
 //
@@ -198,6 +196,9 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
 	WINGAME("vvvampire", "", "VAMPIRE.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", -1, 3),
 
+	WINGAME("warlock", "", "SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867, 3),
+	WINDEMO("warlock", "", "SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934, 3),
+
 	MACGAME("wrath", "", "Wrath of the Gods", "2ce360c9ea2da80a2c6d1040b0ad92dd", 413986, 3),
 
 	{
@@ -303,6 +304,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME("alice", "", "Alice", "3b61149c922f0fd815ca29686e4f554a", 304714, 4),
 	WINGAME("alice", "", "ALICE.EXE", "c67ece9b657ee80355520ac37a25fe55", 684733, 4),
 
+	WINGAME_l("ankh1", "", "ANKH.EXE", "12345", 12345, Common::JA_JPN, 4),
+
 	MACGAME("arcofdoom", "", "Arc Player (4mb)", "ea553e3f3fa123ad38fa5249621e8c8b", 295426, 4),
 	MACDEMO("arcofdoom", "Demo", "ArcDemo", "cdb27c916044ae4dceb4b7326063fa03", 301925, 4),
 	WINGAME("arcofdoom", "", "ARC.EXE", "fd3e9ad004597b01656b28c348a2ae7f", 687973, 4),
@@ -672,6 +675,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME("planetarizona", "", "Planet Arizona", "0c7bbb4b24823e5ab871cb4c1d6f3710", 488433, 4),
 	WINGAME("planetarizona", "", "ARIZONA.EXE", "a23462ec87eff973d2cdb2ddfd4a59fa", 698651, 4),
 
+	// original file name is Paradise*Rescue
+	MACGAME_l("prescue", "", "ParadiseRescue", "0c7bbb4b24823e5ab871cb4c1d6f3710", 488433, Common::JA_JPN, 4),
+	WINGAME_l("prescue", "", "P_RESCUE.EXE", "a23462ec87eff973d2cdb2ddfd4a59fa", 698651, Common::JA_JPN, 4),
+
 	WINDEMO("santafe1", "Demo", "ELKMOON.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
 	WINDEMO("shanghai", "Demo", "SHGMDEMO.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
 
@@ -692,6 +699,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINGAME("teamxtreme1", "", "XTREME.EXE", "45ab80997efedec388ff5200722e673c", 690123, 4),
 	WINGAME("teamxtreme2", "", "TX2.EXE", "50c80bd2add25e574494838772973beb", 2585471, 4),
 
+	// original name is TD MAC/PPC
+	MACGAME("totaldistortion", "", "TD MACPPC", "12345", 12345, 4),
+	WINGAME("totaldistortion", "", "TOTAL_DN", "12345", 12345, 4),
+
 	MACGAME("trekborg", "", "Picard Dossier", "e1dc28c1dd8409c2d2e0d5d269df5ffc", 520069, 4),
 	WINGAME("trekborg", "", "OMNIBORG.EXE", "1580ebad7599fb6c18815e244b0bfda3", 811363, 4),
 
@@ -723,6 +734,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINGAME("amber", "", "amber_jb.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
 
+	// original file names are ' ANKH2 ' and ' ANKH3 '
+	MACGAME_l("ankh2", "", "ANKH2", "12345", 12345, Common::JA_JPN, 5),
+	MACGAME_l("ankh3", "", "ANKH3", "12345", 12345, Common::JA_JPN, 5),
+
 	WINGAME_l("ernie", "", "Ernie.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1417481, Common::SE_SWE, 5),
 	WINDEMO_l("ernie", "Demo", "ERNIE.EXE", "1a7acbba10a7246ba58c1d53fc7203f5", 1417371, Common::SE_SWE, 5),