[Scummvm-git-logs] scummvm master -> 7997c930577eb21e38370b09c21de7c71f7086f4

sev- sev at scummvm.org
Tue Jun 9 20:57:14 UTC 2020


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

Summary:
14d1d1d064 DIRECTOR: Add detection for many Director games
fb3eccda61 DIRECTOR: Organize detection entries
7997c93057 DIRECTOR: Add detection for Journeyman 2 and Daedalus


Commit: 14d1d1d064fe4a22673b2a357d8c3bdf65ec1605
    https://github.com/scummvm/scummvm/commit/14d1d1d064fe4a22673b2a357d8c3bdf65ec1605
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2020-06-09T22:57:07+02:00

Commit Message:
DIRECTOR: Add detection for many Director games

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


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 3be73c1bcb..5eba32a766 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -73,35 +73,60 @@ bool DirectorEngine::hasFeature(EngineFeature f) const {
 } // End of Namespace Director
 
 static const PlainGameDescriptor directorGames[] = {
-	{ "director",	"Macromedia Director Game" },
-	{ "directortest",	"Macromedia Director Test Target" },
+	{ "director",			"Macromedia Director Game" },
+	{ "directortest",		"Macromedia Director Test Target" },
 	{ "directortest-all",	"Macromedia Director All Movies Test Target" },
-	{ "theapartment",	"The Apartment, Interactive demo" },
-	{ "gundam0079",	"Gundam 0079: The War for Earth" },
-	{ "ironhelix",	"Iron Helix" },
-	{ "jewels",		"Jewels of the Oracle" },
-	{ "jman",		"The Journeyman Project" },
-	{ "majestic",	"Majestic Part I: Alien Encounter" },
-	{ "mediaband",	"Meet Mediaband" },
-	{ "melements",	"Masters of the Elements" },
-	{ "spyclub",	"Spy Club" },
-	{ "amber",		"AMBER: Journeys Beyond"},
-	{ "vvvampire",	"Victor Vector & Yondo: The Vampire's Coffin"},
-	{ "vvdinosaur",	"Victor Vector & Yondo: The Last Dinosaur Egg"},
-	{ "warlock", 	"Spaceship Warlock"},
-	{ "ernie",		"Ernie"},
-	{ "id4p1",      "iD4 Mission Disk 1 - Alien Supreme Commander" },
-	{ "id4p2",      "iD4 Mission Disk 2 - Alien Science Officer" },
-	{ "id4p3",      "iD4 Mission Disk 3 - Warrior Alien" },
-	{ "id4p4",      "iD4 Mission Disk 4 - Alien Navigator" },
-	{ "id4p5",      "iD4 Mission Disk 5 - Captain Steve Hiller" },
-	{ "id4p6",      "iD4 Mission Disk 6 - Dave's Computer" },
-	{ "id4p7",      "iD4 Mission Disk 7 - President Whitmore" },
-	{ "id4p8",      "iD4 Mission Disk 8 - Alien Attack Fighter" },
-	{ "id4p9",      "iD4 Mission Disk 9 - FA-18 Fighter Jet" },
-	{ "id4p10",     "iD4 Mission Disk 10 - Alien Bomber" },
-	{ "id4p11",     "iD4 Mission Disk 11 - Area 51" },
-	{ "chopsuey",   "Chop Suey" },
+	{ "theapartment",		"The Apartment, Interactive demo" },
+	{ "gundam0079",			"Gundam 0079: The War for Earth" },
+	{ "ironhelix",			"Iron Helix" },
+	{ "jewels",				"Jewels of the Oracle" },
+	{ "jman",				"The Journeyman Project" },
+	{ "majestic",			"Majestic Part I: Alien Encounter" },
+	{ "mediaband",			"Meet Mediaband" },
+	{ "melements",			"Masters of the Elements" },
+	{ "spyclub",			"Spy Club" },
+	{ "amber",				"AMBER: Journeys Beyond"},
+	{ "vvvampire",			"Victor Vector & Yondo: The Vampire's Coffin"},
+	{ "vvdinosaur",			"Victor Vector & Yondo: The Last Dinosaur Egg"},
+	{ "vvcyber",			"Victor Vector & Yondo: The Cyberplasm Formula"},
+	{ "vvharp",				"Victor Vector & Yondo: The Hypnotic Harp"},
+	{ "warlock", 			"Spaceship Warlock"},
+	{ "ernie",				"Ernie"},
+	{ "id4p1",     			"iD4 Mission Disk 1 - Alien Supreme Commander" },
+	{ "id4p2",      		"iD4 Mission Disk 2 - Alien Science Officer" },
+	{ "id4p3",      		"iD4 Mission Disk 3 - Warrior Alien" },
+	{ "id4p4",      		"iD4 Mission Disk 4 - Alien Navigator" },
+	{ "id4p5",      		"iD4 Mission Disk 5 - Captain Steve Hiller" },
+	{ "id4p6",      		"iD4 Mission Disk 6 - Dave's Computer" },
+	{ "id4p7",      		"iD4 Mission Disk 7 - President Whitmore" },
+	{ "id4p8",      		"iD4 Mission Disk 8 - Alien Attack Fighter" },
+	{ "id4p9",      		"iD4 Mission Disk 9 - FA-18 Fighter Jet" },
+	{ "id4p10",     		"iD4 Mission Disk 10 - Alien Bomber" },
+	{ "id4p11",     		"iD4 Mission Disk 11 - Area 51" },
+	{ "chopsuey",   		"Chop Suey" },
+	{ "madmac",				"Mad Mac Cartoons"},
+	{ "alexworld",			"ALeX-WORLD"},
+	{ "alice",				"Alice: An Interactive Museum"},
+	{ "amandastories",		"AmandaStories"},
+	{ "beyondthewall",		"Beyond the Wall of Stars"},
+	{ "chaos",				"The C.H.A.O.S. Continuum"},
+	{ "gadget",				"Gadget: Invention, Travel, & Adventure"},
+	{ "lzone",				"L-ZONE"},
+	{ "maze",				"The Riddle of the Maze"},
+	{ "murderbrett",		"Who Killed Brett Penance?"},
+	{ "murdermagic",		"The Magic Death"},
+	{ "murdersam",			"Who Killed Sam Rupert?"},
+	{ "murdertaylor",		"Who Killed Taylor French? The Case of the Undressed Reporter"},
+	{ "refixion1",			"Refixion"},
+	{ "refixion2",			"Refixion II: Museum or Hospital"},
+	{ "refixion3",			"Refixion III: The Reindeer Story"},
+	{ "the7colors",			"The Seven Colors: Legend of PSY-S City"},
+	{ "snh",				"A Silly Noisy House"},
+	{ "tri3dtrial",			"Tri-3D-Trial"},
+	{ "wrath",				"Wrath of the Gods"},
+	{ "ybr1",				"Yellow Brick Road"},
+	{ "ybr2",				"Yellow Brick Road II"},
+	{ "ybr3",				"Yellow Brick Road III"},
 	{ 0, 0 }
 };
 
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 2e94b9986f..fff3a73f15 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -211,11 +211,17 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINGAME("vvvampire", "", "VAMPIRE.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", -1, 3),
 	MACGAME("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
-
 	WINGAME("vvdinosaur", "", "DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76", -1, 3),
 	MACGAME("vvdinosaur", "", "Start Game", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
-
-	MACGAME("warlock", "", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271107, 2),
+	WINGAME("vvcyber", "", "CYBER.EXE", "65d06b5fef155a2473434571aff5bc29", 371139, 3),
+	MACGAME("vvcyber", "", "Start Game", "7f443f2e63fd497a9ad85b10dc880a91", 384846, 3),
+	WINDEMO("vvcyber", "Demo", "CYBER.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 639439, 3),
+	MACDEMO("vvcyber", "Demo", "CyberPlasm", "2ce360c9ea2da80a2c6d1040b0ad92dd", 504157, 3),
+	WINGAME("vvharp", "", "HYPNOTIC.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 370272, 3),
+	MACGAME("vvharp", "", "Start Adventure", "7f443f2e63fd497a9ad85b10dc880a91", 383406, 3),
+
+	MACGAME("warlock", "V1.0", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271093, 2),
+	MACGAME("warlock", "V1.1.1", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271107, 2),
 	WINGAME("warlock", "", "SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867, 2),
 
 	WINDEMO("warlock", "", "SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934, 2),
@@ -251,7 +257,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 	{
 		{
 			"gadget",
-			"Gadget: Past as Future",
+			"",
 			AD_ENTRY1s("GADGET.EXE", "d62438566e44826960fc16c5c23dbe43", 2212541),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
@@ -276,6 +282,506 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINGAME("chopsuey", "Chop Suey", "CHOPSUEY.EXE", "785e26240153a028549e8a66c2e904bf", 772382, 4),
 
+	{
+		{
+			// Uses VideoWorks Player 1.00 (pre-director)
+
+			"madmac", "",
+			AD_ENTRY1s("VW Player", "16034c0db4619552e4fe7e108cb98dae", 17070),
+			Common::FR_FRA,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		0
+	},
+
+	{
+		{
+			"alexworld", "",
+			AD_ENTRY1s("ALEX.EXE", "65d06b5fef155a2473434571aff5bc29", 369996),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"alexworld", "",
+			AD_ENTRY1s("AlexWorld", "f5277c53bacd27936158dd3867e587e2", 391576),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"alice", "",
+			AD_ENTRY1s("Alice", "e54ec74aeb4355b0acd46320327c1bed", 274274),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		2
+	},
+
+	WINGAME("alice", "", "ALICE.EXE", "c67ece9b657ee80355520ac37a25fe55", 684733, 4),
+	MACGAME("alice", "", "Alice", "3b61149c922f0fd815ca29686e4f554a", 304714, 4),
+	MACGAME("amandastories", "3.0", "AmandaStories", "1687f456d7f2bcf98e84fec6d3a03c17", 353985, 3),
+	WINGAME("beyondthewall", "", "WALL.EXE", "5c6862a40a48881913ee7c50d25cd984", 225253, 3),
+	MACGAME("beyondthewall", "", "Beyond The Wall Of Stars", "107c6a6d3cce957eaa26d427e672000c", 465523, 3),
+
+	// original file name is The C.H.A.O.S. Continuumâ„¢
+	MACGAME("chaos", "", "The C.H.A.O.S. Continuum", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384481, 3),
+	WINGAME("chaos", "", "CHAOS.EXE", "7c8230a804abf9353b05627a675b5ffb", 375294, 3),
+	MACGAME("maze", "", "Maze", "c4917547b9d9fda87567a9b3544489c4", 384534, 3),
+
+	// original file name is Who Killed Sam Rupert?
+	MACGAME("murdersam", "", "Who Killed Sam Rupert", "243ed9ef948de907401784d0938a4ed5", 518996, 3),
+	WINGAME("murdersam", "", "SAM.EXE", "65d06b5fef155a2473434571aff5bc29", 370016, 3),
+	MACGAME("murdermagic", "", "The Magic Death", "a8788e8b79dccc582b9818ec63734bed", 736754, 3),
+	WINGAME("murdermagic", "", "MAGIC.EXE", "7c8230a804abf9353b05627a675b5ffb", 375298, 3),
+	MACGAME("murderbrett", "", "The Environmental Surfer", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384469, 3),
+	WINGAME("murderbrett", "", "BRETTP.EXE", "65d06b5fef155a2473434571aff5bc29", 370010, 3),
+	MACGAME("murdertaylor", "", "Taylor French", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384469, 3),
+	WINGAME("murdertaylor", "", "TAYLORF.EXE", "65d06b5fef155a2473434571aff5bc29", 370010, 3),
+
+	WINGAME("snh", "", "SNH.EXE", "5a6e241994f671a1ebe664fbae394217", 378901, 3),
+	MACGAME("snh", "", "A Silly Noisy House", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 357142, 3),
+
+	{
+		{
+			"murderbrett", "",
+			AD_ENTRY1s("BRAD.EXE", "e1c3cb4df694b887f3708f9ebb72302f", 934342),
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			"murderbrett", "",
+			AD_ENTRY1s("Brad, le surfeur", "227fcce08de8028e2201f5f4eb3b3cc3", 720160),
+			Common::FR_FRA,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			"murdertaylor", "",
+			AD_ENTRY1s("TF.EXE", "d7a97fbe1daf2bc5fdecee2725c297cd", 952741),
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
+
+	{
+		{
+			"murdertaylor", "",
+			AD_ENTRY1s("Taylor French", "dc839fb9e2f8e6bfc4f4f995c57df495", 291683),
+			Common::DE_DEU,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
+
+	{
+		{
+			"lzone", "",
+			AD_ENTRY1s("L_ZONE.EXE", "65d06b5fef155a2473434571aff5bc29", 370009),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"lzone", "V2.0",
+			AD_ENTRY1s("L-ZONE", "276bee761e48a6fd709df77d5c2f60dd", 395344),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			// May contain English, French, Japanese text
+
+			"gadget", "",
+			AD_ENTRY1s("GADGET.EXE", "2cc9e2dacb90fb130f6ee9519b66c5a8", 369009),
+			Common::EN_ANY,
+			Common::kPlatformFMTowns,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"lzone", "",
+			AD_ENTRY1s("L_ZONE.EXE", "65d06b5fef155a2473434571aff5bc29", 370009),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"lzone", "V2.0",
+			AD_ENTRY1s("L-ZONE", "276bee761e48a6fd709df77d5c2f60dd", 395344),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"lzone", "Bandai Pippin",
+			AD_ENTRY1s("L-ZONE", "07c3095bd36e5aed00ba12f17f761070", 60352),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
+
+	{
+		{
+			// original file name is ~LEGEND OF PSY•S CITY~
+
+			"the7colors", "",
+			AD_ENTRY1s("LEGEND OF PSYS CITY", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384001),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			// English translation by Skye Sonomura (HomeStarRunnerTron)
+
+			"the7colors", "",
+			AD_ENTRY1s("T7C-R!", "d84feae6ba35340857f46c9cbd6bd1a6", 398981),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"tri3dtrial", "",
+			AD_ENTRY1s("Tri-3D-Trial", "cfa68a1bc49251497ebde18e5fc9c217", 271223),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		2
+	},
+
+	{
+		{
+			"refixion1", "",
+			AD_ENTRY1s("REFIXION", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 356245),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"refixion2", "",
+			AD_ENTRY1s("Museum or Hospital", "1ae45c23586b41997ba52e2e7c771c4c", 375841),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"refixion3", "",
+			AD_ENTRY1s("The Reindeer Story", "f5277c53bacd27936158dd3867e587e2", 392473),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	MACGAME("wrath", "", "Wrath of the Gods", "2ce360c9ea2da80a2c6d1040b0ad92dd", 413986, 3),
+
+	{
+		{
+			"wrath", "",
+			{
+				{"000WRATH.EXE", 0, "3162423a1d0885eb1eb94f557a86b258", 372970},
+				{"SHARDCST.MMM", 0, "22af72fba773cc5313d99c91b2e5aea9", 3432948},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"wrath", "Demo",
+			{
+				{"000WRATH.EXE", 0, "3162423a1d0885eb1eb94f557a86b258", 372970},
+				{"SHARDCST.MMM", 0, "85d166abe18730d96e9d4137c66255a1", 3553330},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	MACGAME("ybr1", "", "YBR", "f5277c53bacd27936158dd3867e587e2", 414498, 3),
+
+	{
+		{
+			"ybr1", "",
+			{
+				{"YBR.EXE", 0, "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007},
+				{"START.MMM", 0, "69012b34b3f0e6f1886133b807db4476", 2566872},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"ybr1", "",
+			{
+				{"YBR.EXE", 0, "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007},
+				{"START.MMM", 0, "9e02f41270708101b1d5d04cb822a784", 2563274},
+				AD_LISTEND
+			},
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"ybr1", "",
+			{
+				{"YBR", 0, "f5277c53bacd27936158dd3867e587e2", 414498},
+				{"START", 0, "ca4a6650d8f8ce04b26bcbc941bf0a86", 2417242},
+				AD_LISTEND
+			},
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		3
+	},
+
+	{
+		{
+			"ybr2", "Demo",
+			AD_ENTRY1s("YBR2DEMO.EXE", "25ecc053e02a0ef537d34d615119c814", 900973),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
+
+	{
+		{
+			"ybr2", "",
+			AD_ENTRY1s("YBR2.EXE", "dbe273c1df60305be98a1a582ddd2c3b", 860579),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
+
+	{
+		{
+			"ybr2", "",
+			AD_ENTRY1s("YBR2", "b797956eb3a4dabcc15bfadf6fc66591", 504153),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		4
+	},
+
+	{
+		{
+			"ybr3", "Single Version",
+			AD_ENTRY1s("YBRSingl.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1410799),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			"ybr3", "Demo",
+			AD_ENTRY1s("harapeco.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1693107),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			"ybr3", "Single Version",
+			AD_ENTRY1s("YBR_Single", "6e7e31d05709e1d38d63f4df6a59eec0", 722547),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			// Original file name is non-ASCII Japanese characters
+
+			"ybr3", "Demo",
+			AD_ENTRY1s("harapeco", "4ab012350c6e1c39eda772e33df30cea", 723903),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK | ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			"ybr3", "",
+			AD_ENTRY1s("YBRH", "4c38a51a21a1ad231f218c4786ff771d", 105855),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
+	{
+		{
+			"ybr3", "",
+			AD_ENTRY1s("YBRH.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1410805),
+			Common::JA_JPN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GID_GENERIC,
+		5
+	},
+
 	{ AD_TABLE_END_MARKER, GID_GENERIC, 0 }
 };
 


Commit: fb3eccda619c42839b38d3f30cad35af5c7c2873
    https://github.com/scummvm/scummvm/commit/fb3eccda619c42839b38d3f30cad35af5c7c2873
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2020-06-09T22:57:07+02:00

Commit Message:
DIRECTOR: Organize detection entries

We sort by Director version, then alphabetically, with sections for
version clearly labeled. To clean up non-English versions, use new
macros to pass language.

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


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 5eba32a766..7feb5cb7c0 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -77,21 +77,17 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "directortest",		"Macromedia Director Test Target" },
 	{ "directortest-all",	"Macromedia Director All Movies Test Target" },
 	{ "theapartment",		"The Apartment, Interactive demo" },
-	{ "gundam0079",			"Gundam 0079: The War for Earth" },
-	{ "ironhelix",			"Iron Helix" },
-	{ "jewels",				"Jewels of the Oracle" },
-	{ "jman",				"The Journeyman Project" },
-	{ "majestic",			"Majestic Part I: Alien Encounter" },
-	{ "mediaband",			"Meet Mediaband" },
-	{ "melements",			"Masters of the Elements" },
-	{ "spyclub",			"Spy Club" },
+
+	{ "alexworld",			"ALeX-WORLD"},
+	{ "alice",				"Alice: An Interactive Museum"},
+	{ "amandastories",		"AmandaStories"},
 	{ "amber",				"AMBER: Journeys Beyond"},
-	{ "vvvampire",			"Victor Vector & Yondo: The Vampire's Coffin"},
-	{ "vvdinosaur",			"Victor Vector & Yondo: The Last Dinosaur Egg"},
-	{ "vvcyber",			"Victor Vector & Yondo: The Cyberplasm Formula"},
-	{ "vvharp",				"Victor Vector & Yondo: The Hypnotic Harp"},
-	{ "warlock", 			"Spaceship Warlock"},
+	{ "beyondthewall",		"Beyond the Wall of Stars"},
+	{ "chaos",				"The C.H.A.O.S. Continuum"},
+	{ "chopsuey",   		"Chop Suey" },
 	{ "ernie",				"Ernie"},
+	{ "gadget",				"Gadget: Invention, Travel, & Adventure"},
+	{ "gundam0079",			"Gundam 0079: The War for Earth" },
 	{ "id4p1",     			"iD4 Mission Disk 1 - Alien Supreme Commander" },
 	{ "id4p2",      		"iD4 Mission Disk 2 - Alien Science Officer" },
 	{ "id4p3",      		"iD4 Mission Disk 3 - Warrior Alien" },
@@ -103,16 +99,17 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "id4p9",      		"iD4 Mission Disk 9 - FA-18 Fighter Jet" },
 	{ "id4p10",     		"iD4 Mission Disk 10 - Alien Bomber" },
 	{ "id4p11",     		"iD4 Mission Disk 11 - Area 51" },
-	{ "chopsuey",   		"Chop Suey" },
-	{ "madmac",				"Mad Mac Cartoons"},
-	{ "alexworld",			"ALeX-WORLD"},
-	{ "alice",				"Alice: An Interactive Museum"},
-	{ "amandastories",		"AmandaStories"},
-	{ "beyondthewall",		"Beyond the Wall of Stars"},
-	{ "chaos",				"The C.H.A.O.S. Continuum"},
-	{ "gadget",				"Gadget: Invention, Travel, & Adventure"},
+	{ "ironhelix",			"Iron Helix" },
+	{ "jewels",				"Jewels of the Oracle" },
+	{ "jman",				"The Journeyman Project" },
+	{ "jman2",				"The Journeyman Project 2: Buried in Time" },
+	{ "lion",				"Lion" },
 	{ "lzone",				"L-ZONE"},
+	{ "madmac",				"Mad Mac Cartoons"},
+	{ "majestic",			"Majestic Part I: Alien Encounter" },
 	{ "maze",				"The Riddle of the Maze"},
+	{ "mediaband",			"Meet Mediaband" },
+	{ "melements",			"Masters of the Elements" },
 	{ "murderbrett",		"Who Killed Brett Penance?"},
 	{ "murdermagic",		"The Magic Death"},
 	{ "murdersam",			"Who Killed Sam Rupert?"},
@@ -120,10 +117,19 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "refixion1",			"Refixion"},
 	{ "refixion2",			"Refixion II: Museum or Hospital"},
 	{ "refixion3",			"Refixion III: The Reindeer Story"},
-	{ "the7colors",			"The Seven Colors: Legend of PSY-S City"},
+	{ "rodneyfun",			"Rodney's Funscreen"},
+	{ "screamingmetal",		"Screaming Metal"},
 	{ "snh",				"A Silly Noisy House"},
+	{ "spyclub",			"Spy Club" },
+	{ "the7colors",			"The Seven Colors: Legend of PSY-S City"},
 	{ "tri3dtrial",			"Tri-3D-Trial"},
+	{ "vvcyber",			"Victor Vector & Yondo: The Cyberplasm Formula"},
+	{ "vvdinosaur",			"Victor Vector & Yondo: The Last Dinosaur Egg"},
+	{ "vvharp",				"Victor Vector & Yondo: The Hypnotic Harp"},
+	{ "vvvampire",			"Victor Vector & Yondo: The Vampire's Coffin"},
+	{ "warlock", 			"Spaceship Warlock"},
 	{ "wrath",				"Wrath of the Gods"},
+	{ "xanthus",			"Xanthus"},
 	{ "ybr1",				"Yellow Brick Road"},
 	{ "ybr2",				"Yellow Brick Road II"},
 	{ "ybr3",				"Yellow Brick Road III"},
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index fff3a73f15..78194d81b0 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -31,6 +31,10 @@ namespace Director {
 #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)
+#define MACGAME_1(t,e,f,m,s,l,v) GENGAME_(t,e,f,m,s,l,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
+#define WINGAME_1(t,e,f,m,s,l,v) GENGAME_(t,e,f,m,s,l,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
+#define MACDEMO_1(t,e,f,m,s,l,v) GENGAME_(t,e,f,m,s,l,Common::kPlatformMacintosh,(ADGF_MACRESFORK|ADGF_DEMO),v)
+#define WINDEMO_1(t,e,f,m,s,l,v) GENGAME_(t,e,f,m,s,l,Common::kPlatformWindows,ADGF_DEMO,v)
 
 static const DirectorGameDescription gameDescriptions[] = {
 	// Execute all *.lingo files in game directory
@@ -78,501 +82,111 @@ static const DirectorGameDescription gameDescriptions[] = {
 	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"
 
-	WINGAME("gundam0079", "", "Gundam0079.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
-	MACGAME("gundam0079", "", "Gundam0079", "4c38a51a21a1ad231f218c4786ff771d", -1, 5),
-
-	MACGAME("ironhelix", "", "Iron Helix Minimum", "1ae45c23586b41997ba52e2e7c771c4c", 1652052, 3),
-
-	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.
-	MACGAME("jewels", "", "Jewels 11 Meg", "339c89a148c4ff2c5c815c62ac006325", -1, 4),
-	MACDEMO("jewels", "Two-Minute Demo", "Two-Minute Demo", "01be45e7241194dad07938e7059b88e3", -1, 4),
-
-	MACGAME("jewels", "", "Jewels of the Oracle", "fa52f0136cde568a46249ce74f01a324", -1, 7),
-	WINDEMO("jewels", "Demo", "JEWELS.EXE", "abcc448c035e88d4edb4a29034fd1e34", -1, 4),
-
-	MACGAME("jman", "", "Journeyman.16 MB", "1ae45c23586b41997ba52e2e7c771c4c", 437743, 3),
-	WINGAME("jman", "", "JMAN.EXE", "7c8230a804abf9353b05627a675b5ffb", 375282, 3),
-	WINDEMO("jman", "", "JMDEMO.EXE", "7c8230a804abf9353b05627a675b5ffb", 375305, 3),
-
-	{
-		{
-			"jman",
-			"",
-			AD_ENTRY1("JOURNEY.EXE", "65d06b5fef155a2473434571aff5bc29"),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	MACGAME("jman", "Turbo!", "JMP Turbo\xE2\x84\xA2", "cc3321069072b90f091f220bba16e4d4", -1, 4), // Trademark symbol (UTF-8)
-
-	WINGAME("majestic", "", "MAJESTIC.EXE", "624267f70253e5327981003a6fc0aeba", 23437631, 4),
-
-	MACGAME("majestic", "", "Majestic", "01be45e7241194dad07938e7059b88e3", 483774, 4),
-
-	// Meet Mediaband
-	WINGAME("mediaband", "", "MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921, 4),
-
-	{
-		{
-			// Masters of the Elements - English (from lotharsm)
-			// Developed by IJsfontein, published by Tivola
-			// File version of MVM.EXE is 6.0.2.32
-			// The game disc is a hybrid CD-ROM containing both the Windows and the Macintosh release.
-
-			"melements", "",
-			{
-				{"CHECK.DXR", 0, "c31ee30eebd24a8cf31691fc9926daa4", 901820},
-				{"MVM.EXE", 0, 0, 2565921},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			// Masters of the Elements - English (from lotharsm)
-
-			"melements", "",
-			{
-				{"check.dxr", 0, "36f42340e819d1532c850880afe16581", 898206},
-				{"Masters of the Elements", 0, 0, 1034962},
-				AD_LISTEND
-			},
-			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			// Masters of the Elements - German (from lotharsm)
-			// Released in Germany as "Meister Zufall und die Herrscher der Elemente"
-			// Developed by IJsfontein, published by Tivola
-			// File version of MVM.EXE is 6.0.2.32
-			// The game disc is a hybrid CD-ROM containing both the Windows and the Macintosh release.
-
-			"melements", "",
-			{
-				{"CHECK.DXR", 0, "d1cd0ed95b0e30597e0089bf3e5caf0f", 575414},
-				{"MVM.EXE", 0, 0, 1512503},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			// Masters of the Elements - German (from lotharsm)
-
-			"melements", "",
-			{
-				{"check.dxr", 0, "9c81934b7616ab077f44825b8afaa83e", 575426},
-				{"Meister Zufall", 0, 0, 1034962},
-				AD_LISTEND
-			},
-			Common::DE_DEU,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	WINGAME("spyclub", "", "SPYCLUB.EXE", "65d06b5fef155a2473434571aff5bc29", -1, 3),
-
-	WINGAME("amber", "", "amber_jb.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
-
-	WINGAME("vvvampire", "", "VAMPIRE.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", -1, 3),
-	MACGAME("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
-	WINGAME("vvdinosaur", "", "DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76", -1, 3),
-	MACGAME("vvdinosaur", "", "Start Game", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
-	WINGAME("vvcyber", "", "CYBER.EXE", "65d06b5fef155a2473434571aff5bc29", 371139, 3),
-	MACGAME("vvcyber", "", "Start Game", "7f443f2e63fd497a9ad85b10dc880a91", 384846, 3),
-	WINDEMO("vvcyber", "Demo", "CYBER.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 639439, 3),
-	MACDEMO("vvcyber", "Demo", "CyberPlasm", "2ce360c9ea2da80a2c6d1040b0ad92dd", 504157, 3),
-	WINGAME("vvharp", "", "HYPNOTIC.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 370272, 3),
-	MACGAME("vvharp", "", "Start Adventure", "7f443f2e63fd497a9ad85b10dc880a91", 383406, 3),
-
-	MACGAME("warlock", "V1.0", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271093, 2),
-	MACGAME("warlock", "V1.1.1", "Spaceship Warlock", "cfa68a1bc49251497ebde18e5fc9c217", 271107, 2),
-	WINGAME("warlock", "", "SSWARLCK.EXE", "65d06b5fef155a2473434571aff5bc29", 370867, 2),
-
-	WINDEMO("warlock", "", "SSWDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370934, 2),
-
-	{
-		{
-			"ernie",
-			"Demo",
-			AD_ENTRY1s("ERNIE.EXE", "1a7acbba10a7246ba58c1d53fc7203f5", 1417371),
-			Common::SE_SWE,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			"ernie",
-			"",
-			AD_ENTRY1s("Ernie.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1417481),
-			Common::SE_SWE,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			"gadget",
-			"",
-			AD_ENTRY1s("GADGET.EXE", "d62438566e44826960fc16c5c23dbe43", 2212541),
-			Common::EN_ANY,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS, //ADGF_HICOLOR,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	WINGAME("id4p1", "iD4 Mission Disk 1 - Alien Supreme Commander", "SUPREME.EXE", "629eb9a5d991a2dbe380804e8c37043a", 1664965, 4),
-	WINGAME("id4p2", "iD4 Mission Disk 2 - Alien Science Officer", "SCIENCE.EXE", "812a4b81b70e61e547c14dbbd507b402", 1766499, 4),
-	WINGAME("id4p3", "iD4 Mission Disk 3 - Warrior Alien", "WARRIOR.EXE", "387245092ce0583c6fd0c54000b1502a", 1751593, 4),
-	WINGAME("id4p4", "iD4 Mission Disk 4 - Alien Navigator", "NAV.EXE", "29de2d1fd34029b3c97ce852a7fc665e", 1834037, 4),
-	WINGAME("id4p5", "iD4 Mission Disk 5 - Captain Steve Hiller", "STEVE.EXE", "14f19b724dd6361e4bf3cfddbac87d3f", 1797301, 4),
-	WINGAME("id4p6", "iD4 Mission Disk 6 - Dave's Computer", "DAVE.EXE", "237f9db2ea9a38fa6f7292974539f494", 1774167, 4),
-	WINGAME("id4p7", "iD4 Mission Disk 7 - President Whitmore", "PREZ.EXE", "e7d03a6d749d65dbcea7171ec4627e9c", 1666293, 4),
-	WINGAME("id4p8", "iD4 Mission Disk 8 - Alien Attack Fighter", "ALIEN_F.EXE", "ee2eb92900d515ed7872c57f3b89a408", 1754975, 4),
-	WINGAME("id4p9", "iD4 Mission Disk 9 - FA-18 Fighter Jet", "F18.EXE", "7a0292909a5103c89297c40cce1d836c", 1691893, 4),
-	WINGAME("id4p10", "iD4 Mission Disk 10 - Alien Bomber", "BOMBER.EXE", "17758a9f425f7f3e7a926951e6c770f4", 1844189, 4),
-	WINGAME("id4p11", "iD4 Mission Disk 11 - Area 51", "AREA51.EXE", "78be40f9c7e8e1770c388cc16a522aaf", 1776077, 4),
-
-	WINGAME("chopsuey", "Chop Suey", "CHOPSUEY.EXE", "785e26240153a028549e8a66c2e904bf", 772382, 4),
-
-	{
-		{
-			// Uses VideoWorks Player 1.00 (pre-director)
-
-			"madmac", "",
-			AD_ENTRY1s("VW Player", "16034c0db4619552e4fe7e108cb98dae", 17070),
-			Common::FR_FRA,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		0
-	},
-
-	{
-		{
-			"alexworld", "",
-			AD_ENTRY1s("ALEX.EXE", "65d06b5fef155a2473434571aff5bc29", 369996),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"alexworld", "",
-			AD_ENTRY1s("AlexWorld", "f5277c53bacd27936158dd3867e587e2", 391576),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"alice", "",
-			AD_ENTRY1s("Alice", "e54ec74aeb4355b0acd46320327c1bed", 274274),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		2
-	},
+////////////////////////////////////////
+//
+// VideoWorks Player 1.00 (pre-director)
+//
+////////////////////////////////////////
 
-	WINGAME("alice", "", "ALICE.EXE", "c67ece9b657ee80355520ac37a25fe55", 684733, 4),
-	MACGAME("alice", "", "Alice", "3b61149c922f0fd815ca29686e4f554a", 304714, 4),
-	MACGAME("amandastories", "3.0", "AmandaStories", "1687f456d7f2bcf98e84fec6d3a03c17", 353985, 3),
-	WINGAME("beyondthewall", "", "WALL.EXE", "5c6862a40a48881913ee7c50d25cd984", 225253, 3),
-	MACGAME("beyondthewall", "", "Beyond The Wall Of Stars", "107c6a6d3cce957eaa26d427e672000c", 465523, 3),
+	MACGAME_1("madmac", "", "VW Player", "16034c0db4619552e4fe7e108cb98dae", 17070, Common::FR_FRA, 0),
 
-	// original file name is The C.H.A.O.S. Continuumâ„¢
-	MACGAME("chaos", "", "The C.H.A.O.S. Continuum", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384481, 3),
-	WINGAME("chaos", "", "CHAOS.EXE", "7c8230a804abf9353b05627a675b5ffb", 375294, 3),
-	MACGAME("maze", "", "Maze", "c4917547b9d9fda87567a9b3544489c4", 384534, 3),
+////////////////////////////////////////
+//
+// MacroMind Director v2
+//
+////////////////////////////////////////
 
-	// original file name is Who Killed Sam Rupert?
-	MACGAME("murdersam", "", "Who Killed Sam Rupert", "243ed9ef948de907401784d0938a4ed5", 518996, 3),
-	WINGAME("murdersam", "", "SAM.EXE", "65d06b5fef155a2473434571aff5bc29", 370016, 3),
-	MACGAME("murdermagic", "", "The Magic Death", "a8788e8b79dccc582b9818ec63734bed", 736754, 3),
-	WINGAME("murdermagic", "", "MAGIC.EXE", "7c8230a804abf9353b05627a675b5ffb", 375298, 3),
-	MACGAME("murderbrett", "", "The Environmental Surfer", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384469, 3),
-	WINGAME("murderbrett", "", "BRETTP.EXE", "65d06b5fef155a2473434571aff5bc29", 370010, 3),
-	MACGAME("murdertaylor", "", "Taylor French", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384469, 3),
-	WINGAME("murdertaylor", "", "TAYLORF.EXE", "65d06b5fef155a2473434571aff5bc29", 370010, 3),
+	MACGAME_1("alice", "", "Alice", "e54ec74aeb4355b0acd46320327c1bed", 274274, Common::JA_JPN, 2),
+	MACGAME_1("tri3dtrial", "", "Tri-3D-Trial", "cfa68a1bc49251497ebde18e5fc9c217", 271223, Common::JA_JPN, 2),
 
-	WINGAME("snh", "", "SNH.EXE", "5a6e241994f671a1ebe664fbae394217", 378901, 3),
-	MACGAME("snh", "", "A Silly Noisy House", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 357142, 3),
-
-	{
-		{
-			"murderbrett", "",
-			AD_ENTRY1s("BRAD.EXE", "e1c3cb4df694b887f3708f9ebb72302f", 934342),
-			Common::FR_FRA,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			"murderbrett", "",
-			AD_ENTRY1s("Brad, le surfeur", "227fcce08de8028e2201f5f4eb3b3cc3", 720160),
-			Common::FR_FRA,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
-
-	{
-		{
-			"murdertaylor", "",
-			AD_ENTRY1s("TF.EXE", "d7a97fbe1daf2bc5fdecee2725c297cd", 952741),
-			Common::DE_DEU,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
-
-	{
-		{
-			"murdertaylor", "",
-			AD_ENTRY1s("Taylor French", "dc839fb9e2f8e6bfc4f4f995c57df495", 291683),
-			Common::DE_DEU,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
-
-	{
-		{
-			"lzone", "",
-			AD_ENTRY1s("L_ZONE.EXE", "65d06b5fef155a2473434571aff5bc29", 370009),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"lzone", "V2.0",
-			AD_ENTRY1s("L-ZONE", "276bee761e48a6fd709df77d5c2f60dd", 395344),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			// May contain English, French, Japanese text
-
-			"gadget", "",
-			AD_ENTRY1s("GADGET.EXE", "2cc9e2dacb90fb130f6ee9519b66c5a8", 369009),
-			Common::EN_ANY,
-			Common::kPlatformFMTowns,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"lzone", "",
-			AD_ENTRY1s("L_ZONE.EXE", "65d06b5fef155a2473434571aff5bc29", 370009),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"lzone", "V2.0",
-			AD_ENTRY1s("L-ZONE", "276bee761e48a6fd709df77d5c2f60dd", 395344),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
-
-	{
-		{
-			"lzone", "Bandai Pippin",
-			AD_ENTRY1s("L-ZONE", "07c3095bd36e5aed00ba12f17f761070", 60352),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	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),
 
-	{
-		{
-			// original file name is ~LEGEND OF PSY•S CITY~
+////////////////////////////////////////
+//
+// MacroMind / Macromedia Director v3
+//
+////////////////////////////////////////
 
-			"the7colors", "",
-			AD_ENTRY1s("LEGEND OF PSYS CITY", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384001),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	MACGAME_1("alexworld", "", "AlexWorld", "f5277c53bacd27936158dd3867e587e2", 391576, Common::JA_JPN, 3),
+	WINGAME_1("alexworld", "", "ALEX.EXE", "65d06b5fef155a2473434571aff5bc29", 369996, Common::JA_JPN, 3),
+
+	MACGAME("amandastories", "3.0", "AmandaStories", "1687f456d7f2bcf98e84fec6d3a03c17", 353985, 3),
+
+	MACGAME("beyondthewall", "", "Beyond The Wall Of Stars", "107c6a6d3cce957eaa26d427e672000c", 465523, 3),
+	WINGAME("beyondthewall", "", "WALL.EXE", "5c6862a40a48881913ee7c50d25cd984", 225253, 3),
+
+	MACGAME("chaos", "", "The C.H.A.O.S. Continuum", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384481, 3), // original name is The C.H.A.O.S. Continuumâ„¢
+	WINGAME("chaos", "", "CHAOS.EXE", "7c8230a804abf9353b05627a675b5ffb", 375294, 3),
 
 	{
 		{
-			// English translation by Skye Sonomura (HomeStarRunnerTron)
+			// May contain English, French, Japanese text
 
-			"the7colors", "",
-			AD_ENTRY1s("T7C-R!", "d84feae6ba35340857f46c9cbd6bd1a6", 398981),
+			"gadget", "",
+			AD_ENTRY1s("GADGET.EXE", "2cc9e2dacb90fb130f6ee9519b66c5a8", 369009),
 			Common::EN_ANY,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
+			Common::kPlatformFMTowns,
+			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
 		3
 	},
 
-	{
-		{
-			"tri3dtrial", "",
-			AD_ENTRY1s("Tri-3D-Trial", "cfa68a1bc49251497ebde18e5fc9c217", 271223),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		2
-	},
+	MACGAME("ironhelix", "", "Iron Helix Minimum", "1ae45c23586b41997ba52e2e7c771c4c", 1652052, 3),
+	MACDEMO("ironhelix", "Demo", "IRON HELIX DEMO", "7c80091b84d4d5d48f7c773b30b10598", 1634901, 3),
 
-	{
-		{
-			"refixion1", "",
-			AD_ENTRY1s("REFIXION", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 356245),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	MACGAME("jman", "", "Journeyman.16 MB", "1ae45c23586b41997ba52e2e7c771c4c", 437743, 3),
+	MACDEMO("jman", "Sneak Preview", "Journeyman Sneak Preview", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 6222889, 3),
+	MACDEMO("jman", "CD Demo", "Journeyman Demo", "424093b2bc04a1bfa4376c878f67a364", 3083188, 3),
+	MACDEMO("jman", "Looping Demo", "Journeyman Looping Demo", "1ae45c23586b41997ba52e2e7c771c4c", 3077658, 3),
+	WINGAME("jman", "", "JMAN.EXE", "7c8230a804abf9353b05627a675b5ffb", 375282, 3),
+	WINGAME_1("jman", "", "JOURNEY.EXE", "65d06b5fef155a2473434571aff5bc29", -1, Common::JA_JPN, 3),
+	WINDEMO("jman", "Demo", "JMDEMO.EXE", "7c8230a804abf9353b05627a675b5ffb", 375305, 3),
 
-	{
-		{
-			"refixion2", "",
-			AD_ENTRY1s("Museum or Hospital", "1ae45c23586b41997ba52e2e7c771c4c", 375841),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	MACGAME_1("lzone", "V2.0", "L-ZONE", "276bee761e48a6fd709df77d5c2f60dd", 395344, Common::JA_JPN, 3),
+	WINGAME_1("lzone", "", "L_ZONE.EXE", "65d06b5fef155a2473434571aff5bc29", 370009, Common::JA_JPN, 3),
 
-	{
-		{
-			"refixion3", "",
-			AD_ENTRY1s("The Reindeer Story", "f5277c53bacd27936158dd3867e587e2", 392473),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		3
-	},
+	MACGAME("maze", "", "Maze", "c4917547b9d9fda87567a9b3544489c4", 384534, 3),
+
+	MACGAME("murderbrett", "", "The Environmental Surfer", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384469, 3),
+	WINGAME("murderbrett", "", "BRETTP.EXE", "65d06b5fef155a2473434571aff5bc29", 370010, 3),	
+	MACGAME("murdermagic", "", "The Magic Death", "a8788e8b79dccc582b9818ec63734bed", 736754, 3),
+	WINGAME("murdermagic", "", "MAGIC.EXE", "7c8230a804abf9353b05627a675b5ffb", 375298, 3),
+	MACGAME("murdersam", "", "Who Killed Sam Rupert", "243ed9ef948de907401784d0938a4ed5", 518996, 3), // original name is Who Killed Sam Rupert?
+	WINGAME("murdersam", "", "SAM.EXE", "65d06b5fef155a2473434571aff5bc29", 370016, 3),
+	MACGAME("murdertaylor", "", "Taylor French", "2ce360c9ea2da80a2c6d1040b0ad92dd", 384469, 3),
+	WINGAME("murdertaylor", "", "TAYLORF.EXE", "65d06b5fef155a2473434571aff5bc29", 370010, 3),
+
+	MACGAME_1("refixion1", "", "REFIXION", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 356245, Common::JA_JPN, 3),
+	MACGAME_1("refixion2", "", "Museum or Hospital", "1ae45c23586b41997ba52e2e7c771c4c", 375841, Common::JA_JPN, 3),
+	MACGAME_1("refixion3", "", "The Reindeer Story", "f5277c53bacd27936158dd3867e587e2", 392473, Common::JA_JPN, 3),
+
+	MACDEMO("rodneyfun", "Demo", "Rodney's Funscreen demo", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 356866, 3), // Full game is MADE engine for DOS/Win only
+	MACDEMO("screamingmetal", "Demo", "Screaming Metal Demo", "0a280df213c5bf3eca241f37151e1d56", 373190, 3), // Full game was never released
+
+	MACGAME("snh", "", "A Silly Noisy House", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 357142, 3),
+	WINGAME("snh", "", "SNH.EXE", "5a6e241994f671a1ebe664fbae394217", 378901, 3),
+
+	WINGAME("spyclub", "", "SPYCLUB.EXE", "65d06b5fef155a2473434571aff5bc29", -1, 3),
+
+	MACGAME_1("the7colors", "", "LEGEND OF PSYS CITY", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 384001, Common::JA_JPN, 3), //original name is ~LEGEND OF PSY•S CITY~
+	MACGAME("the7colors", "", "T7C-R!", "d84feae6ba35340857f46c9cbd6bd1a6", 398981, 3), // English translation by Skye Sonomura (HomeStarRunnerTron)
+
+	MACGAME("vvcyber", "", "Start Game", "7f443f2e63fd497a9ad85b10dc880a91", 384846, 3),
+	WINGAME("vvcyber", "", "CYBER.EXE", "65d06b5fef155a2473434571aff5bc29", 371139, 3),
+	MACDEMO("vvcyber", "Demo", "CyberPlasm", "2ce360c9ea2da80a2c6d1040b0ad92dd", 504157, 3),
+	WINDEMO("vvcyber", "Demo", "CYBER.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 639439, 3),
+	MACGAME("vvdinosaur", "", "Start Game", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
+	WINGAME("vvdinosaur", "", "DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76", -1, 3),
+	MACGAME("vvharp", "", "Start Adventure", "7f443f2e63fd497a9ad85b10dc880a91", 383406, 3),
+	WINGAME("vvharp", "", "HYPNOTIC.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 370272, 3),
+	MACGAME("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 3),
+	WINGAME("vvvampire", "", "VAMPIRE.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", -1, 3),
 
 	MACGAME("wrath", "", "Wrath of the Gods", "2ce360c9ea2da80a2c6d1040b0ad92dd", 413986, 3),
 
@@ -610,6 +224,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 		3
 	},
 
+	MACDEMO("xanthus", "Demo", "X A N T H U S", "1ae45c23586b41997ba52e2e7c771c4c", 375447, 3), // may be vaporware; original name is ∆ X A N T H U S ∆
+
 	MACGAME("ybr1", "", "YBR", "f5277c53bacd27936158dd3867e587e2", 414498, 3),
 
 	{
@@ -633,13 +249,13 @@ static const DirectorGameDescription gameDescriptions[] = {
 		{
 			"ybr1", "",
 			{
-				{"YBR.EXE", 0, "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007},
-				{"START.MMM", 0, "9e02f41270708101b1d5d04cb822a784", 2563274},
+				{"YBR", 0, "f5277c53bacd27936158dd3867e587e2", 414498},
+				{"START", 0, "ca4a6650d8f8ce04b26bcbc941bf0a86", 2417242},
 				AD_LISTEND
 			},
 			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
+			Common::kPlatformMacintosh,
+			ADGF_MACRESFORK,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -650,51 +266,75 @@ static const DirectorGameDescription gameDescriptions[] = {
 		{
 			"ybr1", "",
 			{
-				{"YBR", 0, "f5277c53bacd27936158dd3867e587e2", 414498},
-				{"START", 0, "ca4a6650d8f8ce04b26bcbc941bf0a86", 2417242},
+				{"YBR.EXE", 0, "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007},
+				{"START.MMM", 0, "9e02f41270708101b1d5d04cb822a784", 2563274},
 				AD_LISTEND
 			},
 			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
 		3
 	},
 
-	{
-		{
-			"ybr2", "Demo",
-			AD_ENTRY1s("YBR2DEMO.EXE", "25ecc053e02a0ef537d34d615119c814", 900973),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+////////////////////////////////////////
+//
+// Macromedia Director v4
+//
+////////////////////////////////////////
 
-	{
-		{
-			"ybr2", "",
-			AD_ENTRY1s("YBR2.EXE", "dbe273c1df60305be98a1a582ddd2c3b", 860579),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		4
-	},
+	MACGAME("alice", "", "Alice", "3b61149c922f0fd815ca29686e4f554a", 304714, 4),
+	WINGAME("alice", "", "ALICE.EXE", "c67ece9b657ee80355520ac37a25fe55", 684733, 4),
+
+	WINGAME("chopsuey", "Chop Suey", "CHOPSUEY.EXE", "785e26240153a028549e8a66c2e904bf", 772382, 4),
+
+	MACDEMO("gundam0079", "Demo", "Gundam Demo", "01be45e7241194dad07938e7059b88e3", 483376, 4), // Full game is D5
+
+	WINGAME("id4p1", "iD4 Mission Disk 1 - Alien Supreme Commander", "SUPREME.EXE", "629eb9a5d991a2dbe380804e8c37043a", 1664965, 4),
+	WINGAME("id4p2", "iD4 Mission Disk 2 - Alien Science Officer", "SCIENCE.EXE", "812a4b81b70e61e547c14dbbd507b402", 1766499, 4),
+	WINGAME("id4p3", "iD4 Mission Disk 3 - Warrior Alien", "WARRIOR.EXE", "387245092ce0583c6fd0c54000b1502a", 1751593, 4),
+	WINGAME("id4p4", "iD4 Mission Disk 4 - Alien Navigator", "NAV.EXE", "29de2d1fd34029b3c97ce852a7fc665e", 1834037, 4),
+	WINGAME("id4p5", "iD4 Mission Disk 5 - Captain Steve Hiller", "STEVE.EXE", "14f19b724dd6361e4bf3cfddbac87d3f", 1797301, 4),
+	WINGAME("id4p6", "iD4 Mission Disk 6 - Dave's Computer", "DAVE.EXE", "237f9db2ea9a38fa6f7292974539f494", 1774167, 4),
+	WINGAME("id4p7", "iD4 Mission Disk 7 - President Whitmore", "PREZ.EXE", "e7d03a6d749d65dbcea7171ec4627e9c", 1666293, 4),
+	WINGAME("id4p8", "iD4 Mission Disk 8 - Alien Attack Fighter", "ALIEN_F.EXE", "ee2eb92900d515ed7872c57f3b89a408", 1754975, 4),
+	WINGAME("id4p9", "iD4 Mission Disk 9 - FA-18 Fighter Jet", "F18.EXE", "7a0292909a5103c89297c40cce1d836c", 1691893, 4),
+	WINGAME("id4p10", "iD4 Mission Disk 10 - Alien Bomber", "BOMBER.EXE", "17758a9f425f7f3e7a926951e6c770f4", 1844189, 4),
+	WINGAME("id4p11", "iD4 Mission Disk 11 - Area 51", "AREA51.EXE", "78be40f9c7e8e1770c388cc16a522aaf", 1776077, 4),
+
+	// Note: There are four versions of the binary included on the disc.
+	// 5.6, 6, and 9 Meg variants all exist too.
+	MACGAME("jewels", "", "Jewels 11 Meg", "339c89a148c4ff2c5c815c62ac006325", -1, 4),
+	MACDEMO("jewels", "Two-Minute Demo", "Two-Minute Demo", "01be45e7241194dad07938e7059b88e3", -1, 4),
+
+	WINGAME("jewels", "", "JEWELS.EXE", "bb6d81471d166088260090472c6c3a87", -1, 4),
+	WINDEMO("jewels", "Demo", "JEWELS.EXE", "abcc448c035e88d4edb4a29034fd1e34", -1, 4),
+	WINDEMO("jewels", "Two-Minute Demo", "DEMO.EXE", "ebee52d3c4280674c600177df5b09da0", -1, 4),
+
+	MACGAME("jman", "Turbo!", "JMP Turbo", "cc3321069072b90f091f220bba16e4d4", -1, 4), // original name is JMP Turboâ„¢
+	MACGAME("jman", "Making Of", "The Journey", "cc3321069072b90f091f220bba16e4d4", -1, 4),
+	MACDEMO("jman", "Director's Cut Demo", "Journeyman - Director's Cut", "01be45e7241194dad07938e7059b88e3", 484284, 4),
+
+	MACGAME("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 80334, 4), // original name is Buried in Timeâ„¢ PowerPC; also contains 68k binary
+	MACGAME_1("jman2", "", "Buried in Time PowerPC", "71287376e445ab9c98f0d150bb0ed175", 86324, Common::DE_DEU, 4), // see English notes
+	MACDEMO("jman2", "Demo", "Buried in Time Demo", "1ae45c23586b41997ba52e2e7c771c4c", 437743, 4),
+	MACDEMO("jman2", "06/22/94 Demo", "Buried in Time Demo", "cdb27c916044ae4dceb4b7326063fa03", 328895, 4),
+	MACDEMO("jman2", "Final Demo", "Buried in Time Demo", "cc3321069072b90f091f220bba16e4d4", 292731, 4),
+	MACDEMO("jman2", "Gallery", "BIT Gallery", "01be45e7241194dad07938e7059b88e3", 484284, 4),
+	MACDEMO("jman2", "Overview", "BIT Overview", "01be45e7241194dad07938e7059b88e3", 484284, 4),
+
+	MACDEMO("lion", "Demo", "Lion Demo", "01be45e7241194dad07938e7059b88e3", 484284, 4), // full game is DOS only, not Director
 
 	{
 		{
-			"ybr2", "",
-			AD_ENTRY1s("YBR2", "b797956eb3a4dabcc15bfadf6fc66591", 504153),
+			// Win/Mac versions are D3
+
+			"lzone", "Pippin",
+			AD_ENTRY1s("L-ZONE", "07c3095bd36e5aed00ba12f17f761070", 60352),
 			Common::JA_JPN,
-			Common::kPlatformMacintosh,
+			Common::kPlatformMacintosh, //kPlatformPippin
 			ADGF_MACRESFORK,
 			GUIO1(GUIO_NOASPECT)
 		},
@@ -702,37 +342,46 @@ static const DirectorGameDescription gameDescriptions[] = {
 		4
 	},
 
-	{
-		{
-			"ybr3", "Single Version",
-			AD_ENTRY1s("YBRSingl.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1410799),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
+	MACGAME("majestic", "", "Majestic", "01be45e7241194dad07938e7059b88e3", 483774, 4),
+	WINGAME("majestic", "", "MAJESTIC.EXE", "624267f70253e5327981003a6fc0aeba", 23437631, 4),
+
+	WINGAME("mediaband", "", "MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921, 4),
+
+	MACGAME_1("murdertaylor", "", "Taylor French", "dc839fb9e2f8e6bfc4f4f995c57df495", 291683, Common::DE_DEU, 4),
+	WINGAME_1("murdertaylor", "", "TF.EXE", "d7a97fbe1daf2bc5fdecee2725c297cd", 952741, Common::DE_DEU, 4),
+
+	MACGAME_1("ybr2", "", "YBR2", "b797956eb3a4dabcc15bfadf6fc66591", 504153, Common::JA_JPN, 4),
+	WINGAME_1("ybr2", "", "YBR2.EXE", "dbe273c1df60305be98a1a582ddd2c3b", 860579, Common::JA_JPN, 4),
+	WINDEMO_1("ybr2", "Demo", "YBR2DEMO.EXE", "25ecc053e02a0ef537d34d615119c814", 900973, Common::JA_JPN, 4),
+
+////////////////////////////////////////
+//
+// Macromedia Director v5
+//
+////////////////////////////////////////
+
+	WINGAME("amber", "", "amber_jb.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
+
+	WINGAME_1("ernie", "", "Ernie.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1417481, Common::SE_SWE, 5),
+	WINDEMO_1("ernie", "Demo", "ERNIE.EXE", "1a7acbba10a7246ba58c1d53fc7203f5", 1417371, Common::SE_SWE, 5),
+
+	WINGAME("gadget", "", "GADGET.EXE", "d62438566e44826960fc16c5c23dbe43", 2212541, 5),  //ADGF_HICOLOR,
+
+	MACGAME("gundam0079", "", "Gundam0079", "4c38a51a21a1ad231f218c4786ff771d", -1, 5),
+	WINGAME("gundam0079", "", "Gundam0079.exe", "1a7acbba10a7246ba58c1d53fc7203f5", -1, 5),
 
-	{
-		{
-			"ybr3", "Demo",
-			AD_ENTRY1s("harapeco.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1693107),
-			Common::JA_JPN,
-			Common::kPlatformWindows,
-			ADGF_DEMO,
-			GUIO1(GUIO_NOASPECT)
-		},
-		GID_GENERIC,
-		5
-	},
 
 	{
 		{
-			"ybr3", "Single Version",
-			AD_ENTRY1s("YBR_Single", "6e7e31d05709e1d38d63f4df6a59eec0", 722547),
-			Common::JA_JPN,
+			// Masters of the Elements - English (from lotharsm)
+
+			"melements", "",
+			{
+				{"check.dxr", 0, "36f42340e819d1532c850880afe16581", 898206},
+				{"Masters of the Elements", 0, 0, 1034962},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
 			Common::kPlatformMacintosh,
 			ADGF_MACRESFORK,
 			GUIO1(GUIO_NOASPECT)
@@ -743,13 +392,20 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	{
 		{
-			// Original file name is non-ASCII Japanese characters
+			// Masters of the Elements - English (from lotharsm)
+			// Developed by IJsfontein, published by Tivola
+			// File version of MVM.EXE is 6.0.2.32
+			// The game disc is a hybrid CD-ROM containing both the Windows and the Macintosh release.
 
-			"ybr3", "Demo",
-			AD_ENTRY1s("harapeco", "4ab012350c6e1c39eda772e33df30cea", 723903),
-			Common::JA_JPN,
-			Common::kPlatformMacintosh,
-			ADGF_MACRESFORK | ADGF_DEMO,
+			"melements", "",
+			{
+				{"CHECK.DXR", 0, "c31ee30eebd24a8cf31691fc9926daa4", 901820},
+				{"MVM.EXE", 0, 0, 2565921},
+				AD_LISTEND
+			},
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_GENERIC,
@@ -758,9 +414,15 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	{
 		{
-			"ybr3", "",
-			AD_ENTRY1s("YBRH", "4c38a51a21a1ad231f218c4786ff771d", 105855),
-			Common::JA_JPN,
+			// Masters of the Elements - German (from lotharsm)
+
+			"melements", "",
+			{
+				{"check.dxr", 0, "9c81934b7616ab077f44825b8afaa83e", 575426},
+				{"Meister Zufall", 0, 0, 1034962},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
 			Common::kPlatformMacintosh,
 			ADGF_MACRESFORK,
 			GUIO1(GUIO_NOASPECT)
@@ -771,9 +433,19 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	{
 		{
-			"ybr3", "",
-			AD_ENTRY1s("YBRH.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1410805),
-			Common::JA_JPN,
+			// Masters of the Elements - German (from lotharsm)
+			// Released in Germany as "Meister Zufall und die Herrscher der Elemente"
+			// Developed by IJsfontein, published by Tivola
+			// File version of MVM.EXE is 6.0.2.32
+			// The game disc is a hybrid CD-ROM containing both the Windows and the Macintosh release.
+
+			"melements", "",
+			{
+				{"CHECK.DXR", 0, "d1cd0ed95b0e30597e0089bf3e5caf0f", 575414},
+				{"MVM.EXE", 0, 0, 1512503},
+				AD_LISTEND
+			},
+			Common::DE_DEU,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
 			GUIO1(GUIO_NOASPECT)
@@ -782,6 +454,31 @@ static const DirectorGameDescription gameDescriptions[] = {
 		5
 	},
 
+	MACGAME_1("murderbrett", "", "Brad, le surfeur", "227fcce08de8028e2201f5f4eb3b3cc3", 720160, Common::FR_FRA, 5),
+	WINGAME_1("murderbrett", "", "BRAD.EXE", "e1c3cb4df694b887f3708f9ebb72302f", 934342, Common::FR_FRA, 5),
+
+	MACGAME_1("ybr3", "", "YBRH", "4c38a51a21a1ad231f218c4786ff771d", 105855, Common::JA_JPN, 5),
+	MACGAME_1("ybr3", "Single Version", "YBR_Single", "6e7e31d05709e1d38d63f4df6a59eec0", 722547, Common::JA_JPN, 5),
+	MACDEMO_1("ybr3", "Demo", "harapeco", "4ab012350c6e1c39eda772e33df30cea", 723903, Common::JA_JPN, 5), // Original name is non-ASCII Japanese characters
+	WINGAME_1("ybr3", "", "YBRH.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1410805, Common::JA_JPN, 5), // Original name is non-ASCII Japanese characters
+	WINGAME_1("ybr3", "Single Version", "YBRSingl.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1410799, Common::JA_JPN, 5),
+	WINDEMO_1("ybr3", "Demo", "harapeco.exe", "1a7acbba10a7246ba58c1d53fc7203f5", 1693107, Common::JA_JPN, 5),
+
+////////////////////////////////////////
+//
+// Macromedia Director v6
+//
+////////////////////////////////////////
+
+////////////////////////////////////////
+//
+// Macromedia Director v7
+//
+////////////////////////////////////////
+
+	MACGAME("jewels", "", "Jewels of the Oracle", "fa52f0136cde568a46249ce74f01a324", -1, 7),
+	WINGAME("jewels", "", "Jewels.exe", "c1a2e8b7e41fa204009324a9c7db1030", -1, 7),
+
 	{ AD_TABLE_END_MARKER, GID_GENERIC, 0 }
 };
 


Commit: 7997c930577eb21e38370b09c21de7c71f7086f4
    https://github.com/scummvm/scummvm/commit/7997c930577eb21e38370b09c21de7c71f7086f4
Author: trembyle (sean.patrick.brody at gmail.com)
Date: 2020-06-09T22:57:07+02:00

Commit Message:
DIRECTOR: Add detection for Journeyman 2 and Daedalus

Later editions of Journeyman 2 included an interactive Making Of video.
This is now in detection, along with other Journeyman demos. Also added
various Windows demos from Activision.

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


diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 7feb5cb7c0..f1aa06e7d7 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -82,12 +82,16 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "alice",				"Alice: An Interactive Museum"},
 	{ "amandastories",		"AmandaStories"},
 	{ "amber",				"AMBER: Journeys Beyond"},
+	{ "ataripack",			"Activision's Atari 2600 Action Pack"},
 	{ "beyondthewall",		"Beyond the Wall of Stars"},
 	{ "chaos",				"The C.H.A.O.S. Continuum"},
 	{ "chopsuey",   		"Chop Suey" },
+	{ "daedalus",			"The Daedalus Encounter"},
+	{ "earthwormjim",		"Earthworm Jim"},
 	{ "ernie",				"Ernie"},
 	{ "gadget",				"Gadget: Invention, Travel, & Adventure"},
 	{ "gundam0079",			"Gundam 0079: The War for Earth" },
+	{ "hyperblade",			"HyperBlade" },
 	{ "id4p1",     			"iD4 Mission Disk 1 - Alien Supreme Commander" },
 	{ "id4p2",      		"iD4 Mission Disk 2 - Alien Science Officer" },
 	{ "id4p3",      		"iD4 Mission Disk 3 - Warrior Alien" },
@@ -108,19 +112,25 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "madmac",				"Mad Mac Cartoons"},
 	{ "majestic",			"Majestic Part I: Alien Encounter" },
 	{ "maze",				"The Riddle of the Maze"},
+	{ "mechwarrior2",		"MechWarrior 2" },
 	{ "mediaband",			"Meet Mediaband" },
 	{ "melements",			"Masters of the Elements" },
+	{ "muppets",			"Muppet Treasure Island" },
 	{ "murderbrett",		"Who Killed Brett Penance?"},
 	{ "murdermagic",		"The Magic Death"},
 	{ "murdersam",			"Who Killed Sam Rupert?"},
 	{ "murdertaylor",		"Who Killed Taylor French? The Case of the Undressed Reporter"},
+	{ "pitfall",			"Pitfall: The Mayan Adventure" },
 	{ "refixion1",			"Refixion"},
 	{ "refixion2",			"Refixion II: Museum or Hospital"},
 	{ "refixion3",			"Refixion III: The Reindeer Story"},
-	{ "rodneyfun",			"Rodney's Funscreen"},
+	{ "rodney",				"Rodney's Funscreen"},
+	{ "santafe1",			"Santa Fe Mysteries: The Elk Moon Murder"},
 	{ "screamingmetal",		"Screaming Metal"},
+	{ "shanghai",			"Shanghai: Great Moments"},
 	{ "snh",				"A Silly Noisy House"},
 	{ "spyclub",			"Spy Club" },
+	{ "spycraft",			"Spycraft: The Great Game" },
 	{ "the7colors",			"The Seven Colors: Legend of PSY-S City"},
 	{ "tri3dtrial",			"Tri-3D-Trial"},
 	{ "vvcyber",			"Victor Vector & Yondo: The Cyberplasm Formula"},
@@ -133,6 +143,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "ybr1",				"Yellow Brick Road"},
 	{ "ybr2",				"Yellow Brick Road II"},
 	{ "ybr3",				"Yellow Brick Road III"},
+	{ "znemesis",			"Zork Nemesis: The Forbidden Lands"},
 	{ 0, 0 }
 };
 
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 78194d81b0..b46d30adff 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -166,8 +166,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME_1("refixion2", "", "Museum or Hospital", "1ae45c23586b41997ba52e2e7c771c4c", 375841, Common::JA_JPN, 3),
 	MACGAME_1("refixion3", "", "The Reindeer Story", "f5277c53bacd27936158dd3867e587e2", 392473, Common::JA_JPN, 3),
 
-	MACDEMO("rodneyfun", "Demo", "Rodney's Funscreen demo", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 356866, 3), // Full game is MADE engine for DOS/Win only
-	MACDEMO("screamingmetal", "Demo", "Screaming Metal Demo", "0a280df213c5bf3eca241f37151e1d56", 373190, 3), // Full game was never released
+	MACDEMO("rodney", "Demo", "Rodney's Funscreen demo", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 356866, 3), // full game is supported in MADE engine
+	MACDEMO("screamingmetal", "Demo", "Screaming Metal Demo", "0a280df213c5bf3eca241f37151e1d56", 373190, 3), // full game was never released
 
 	MACGAME("snh", "", "A Silly Noisy House", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 357142, 3),
 	WINGAME("snh", "", "SNH.EXE", "5a6e241994f671a1ebe664fbae394217", 378901, 3),
@@ -288,9 +288,20 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME("alice", "", "Alice", "3b61149c922f0fd815ca29686e4f554a", 304714, 4),
 	WINGAME("alice", "", "ALICE.EXE", "c67ece9b657ee80355520ac37a25fe55", 684733, 4),
 
-	WINGAME("chopsuey", "Chop Suey", "CHOPSUEY.EXE", "785e26240153a028549e8a66c2e904bf", 772382, 4),
+	WINDEMO("ataripack", "Demo", "ACTDEMO.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
+	WINDEMO("c64pack", "Demo", "C64DEMO.EXE", "0458e44d9ad4ae0d3a583ac4141d21ae", 1007517, 4), // full game is not Director
 
-	MACDEMO("gundam0079", "Demo", "Gundam Demo", "01be45e7241194dad07938e7059b88e3", 483376, 4), // Full game is D5
+	WINGAME("chopsuey", "", "CHOPSUEY.EXE", "785e26240153a028549e8a66c2e904bf", 772382, 4),
+
+	MACGAME("daedalus", "", "DAEDALUS.DAT", "4eb2fab14f1b932ae9f01d8b05a411de", 69794, 4),
+	MACGAME_1("daedalus", "", "DAEDALUS.DAT", "2b9e22ee93e5d58f383ef389fa09e12b", 69794, Common::DE_DEU, 4),
+	MACGAME_1("daedalus", "", "DAEDALUS.DAT", "2b9e22ee93e5d58f383ef389fa09e12b", 69794, Common::FR_FRA, 4),
+
+	WINDEMO("earthwormjim", "Demo", "EWJDEMO.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
+
+	MACDEMO("gundam0079", "Demo", "Gundam Demo", "01be45e7241194dad07938e7059b88e3", 483376, 4), // full game is D5
+
+	WINDEMO("hyperblade", "Demo", "HYPER.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
 
 	WINGAME("id4p1", "iD4 Mission Disk 1 - Alien Supreme Commander", "SUPREME.EXE", "629eb9a5d991a2dbe380804e8c37043a", 1664965, 4),
 	WINGAME("id4p2", "iD4 Mission Disk 2 - Alien Science Officer", "SCIENCE.EXE", "812a4b81b70e61e547c14dbbd507b402", 1766499, 4),
@@ -347,13 +358,23 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINGAME("mediaband", "", "MEDIABND.EXE", "0cfb9b4762e33ab56d656a0eb146a048", 717921, 4),
 
+	WINDEMO("mechwarrior2", "Demo", "MW2DEMO.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
+	WINDEMO("muppets", "Demo", "MUPPETS.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
+
 	MACGAME_1("murdertaylor", "", "Taylor French", "dc839fb9e2f8e6bfc4f4f995c57df495", 291683, Common::DE_DEU, 4),
 	WINGAME_1("murdertaylor", "", "TF.EXE", "d7a97fbe1daf2bc5fdecee2725c297cd", 952741, Common::DE_DEU, 4),
 
+	WINDEMO("pitfall", "Demo", "PITDEMO.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
+	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
+	WINDEMO("spycraft", "Demo", "SPYCRAFT.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is not Director
+
 	MACGAME_1("ybr2", "", "YBR2", "b797956eb3a4dabcc15bfadf6fc66591", 504153, Common::JA_JPN, 4),
 	WINGAME_1("ybr2", "", "YBR2.EXE", "dbe273c1df60305be98a1a582ddd2c3b", 860579, Common::JA_JPN, 4),
 	WINDEMO_1("ybr2", "Demo", "YBR2DEMO.EXE", "25ecc053e02a0ef537d34d615119c814", 900973, Common::JA_JPN, 4),
 
+	WINDEMO("znemesis", "Demo", "ZORKDEMO.EXE", "4a8fd0d74faef305bc935e1aac94d3e8", 712817, 4), // full game is supported in ZVision engine
+
 ////////////////////////////////////////
 //
 // Macromedia Director v5




More information about the Scummvm-git-logs mailing list