[Scummvm-git-logs] scummvm master -> 7ff867bfc4a369912ac2c668d027bdada9b6b63d

Fri Dec 2 14:12:00 UTC 2022

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

Summary:
bee8ea29b9 DIRECTOR: Improve detection for some D3 entries
7ff867bfc4 DIRECTOR: Improve detection for some D3 entries


Commit: bee8ea29b933472dd50480735e5df812b0026cab
    https://github.com/scummvm/scummvm/commit/bee8ea29b933472dd50480735e5df812b0026cab
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2022-12-02T15:07:27+01:00

Commit Message:
DIRECTOR: Improve detection for some D3 entries

* A-L School World (jap)
* Scissors N Stones
* RIDE
* Smithsonian's America
* Supersonic
* Star TreK Final Unity
* Ultimate Robot Toolkit

Changed paths:
    engines/director/detection_tables.h

diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index e4df6c00296..2476418f129 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2596,14 +2596,17 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1("satodesign", "Gift Disk", "Animation", "a03ae8a9bf211bcb26388b6b6da17c2b", 388853, 311),
 	MACGAME1("satohomosexual", "", "SATO&NAKAZAWA", "a03ae8a9bf211bcb26388b6b6da17c2b", 736276, 311),
 
-	MACGAME1_l("schoolworld", "Breed",	 "BREED",			 "f5277c53bacd27936158dd3867e587e2", 545024, Common::JA_JPN, 311),
-	WINGAME1t_l("schoolworld", "Breed",	  "BREED.EXE",		  "4dcee516cdda1661c2c62852d8c1350f", 375277, Common::JA_JPN, 310),
-	MACGAME1_l("schoolworld", "Capture", "CAPTURE",			 "f5277c53bacd27936158dd3867e587e2", 1652208, Common::JA_JPN, 311),
-	WINGAME1t_l("schoolworld", "Capture", "CAPTURE.EXE",	  "f0bfae0867a86735affd5d0e07e857e7", 375279, Common::JA_JPN, 310),
-	MACDEMO1_l("schoolworld", "Demo",	 "SchoolWorld-DEMO", "f5277c53bacd27936158dd3867e587e2", 4046527, Common::JA_JPN, 311),
+	MACGAME1_l("schoolworld", "Breed",	  "BREED",			  "f5277c53bacd27936158dd3867e587e2", 545024, Common::JA_JPN, 311),
+	WINGAME2t_l("schoolworld", "Breed",	  "BREED.EXE",		  "4dcee516cdda1661c2c62852d8c1350f", 375277,
+										  "BREED.MMM",		  "0bc20ce52a7672998e45b48ea5f28b42", 34576, Common::JA_JPN, 310),
+	MACGAME1_l("schoolworld", "Capture",  "CAPTURE",		  "f5277c53bacd27936158dd3867e587e2", 1652208, Common::JA_JPN, 311),
+	WINGAME2t_l("schoolworld", "Capture", "CAPTURE.EXE",	  "f0bfae0867a86735affd5d0e07e857e7", 375279,
+										  "CAPTURE.MMM",	  "856d2396bf2a8d82a1d5ee460dc080a0", 1448122, Common::JA_JPN, 310),
+	MACDEMO1_l("schoolworld", "Demo",	  "SchoolWorld-DEMO", "f5277c53bacd27936158dd3867e587e2", 4046527, Common::JA_JPN, 311),
 
 	// Manual only. Full game is made in VB3 and contains unsupported content
-	WINGAME1("scissorsnstones", "", "MANUAL.EXE", "7c8230a804abf9353b05627a675b5ffb", 2494292, 310),
+	WINGAME2t("scissorsnstones", "", "MANUAL.EXE", "ef9462b3aaa45bb50824b33b808c1639", 2494292,
+									 "SNS.ICO",	   "6545337dac69926f2776a9234c2015e6", 766, 310),
 
 	// Full game was never released
 	MACDEMO1("screamingmetal", "v1.0 Demo", "xn--Screaming Metal Demo-3h7l", "0a280df213c5bf3eca241f37151e1d56", 372934, 310),
@@ -2629,7 +2632,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1("sialmanac94", "", "1994 Almanac", "c72a99a71c87ad34e416f7e7776450a8", 499898, 310),
 	WINGAME1("sialmanac94", "", "SPORTSI.EXE", "990caf82b2406e3342fb93ddb7222bf5", 461040, 310),
 
-	WINDEMO1("sk8board", "Demo", "RIDE.EXE", "65d06b5fef155a2473434571aff5bc29", 370013, 310),
+	WINDEMO2("sk8board", "Demo", "RIDE.EXE",  "65d06b5fef155a2473434571aff5bc29", 370013,
+								 "INTRO.MMM", "91195cec43e8a7bafe8b91d5e121b2e5", 273118, 310),
 
 	// Demo from Blender 1.5
 	// Version 1.2 onwards are D4
@@ -2637,7 +2641,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACDEMO1("smile", "v1.1", "Smile!", "1ae45c23586b41997ba52e2e7c771c4c", 1462136, 310),
 
 	MACGAME1("smithamerica", "", "Smithsonian's America", "b2df07bdfe2a843e8f355a77a1cca47e", 384223, 313),
-	WINGAME1t("smithamerica", "", "AMERICA.EXE", "762716cefb27adf3156d5978ce62c0d8", 370010, 310),
+	WINGAME2t("smithamerica", "", "AMERICA.EXE", "762716cefb27adf3156d5978ce62c0d8", 370010,
+								  "AMERG.MMM",	 "44c614d4bcc9c2dbc0b5372f40d73c9b", 1928814, 310),
 
 	// Original Mac version uses audio tracks, hybrid Mac/Win uses WAV files
 	// German version (Das Bi-Ba-Butze-Haus) published by Systhema, Munich (1995) and later by Rowohlt-Systhema (1999)
@@ -2660,7 +2665,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACDEMO1("stravinsky", "Sampler", "Stravinsky Sampler", "283b66579162e5654fbb0ece117c9885", 2039600, 311),
 
 	MACGAME1("supersonic", "", "Double-click me", "1ae45c23586b41997ba52e2e7c771c4c", 375190, 310),
-	WINGAME1("supersonic", "", "SUPERS.EXE", "7c8230a804abf9353b05627a675b5ffb", 375290, 310),
+	WINGAME2("supersonic", "", "SUPERS.EXE",   "7c8230a804abf9353b05627a675b5ffb", 375290,
+							   "MAINMENU.MMM", "8ea99e5a90c5193af63049c35331d6f2", 648142, 310),
 
 	// Win version requires installation, INSTALL.EXE
 	MACGAME1("take5", "", "Take Five", "1ae45c23586b41997ba52e2e7c771c4c", 1626989, 313),
@@ -2697,7 +2703,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	MACDEMO1_l("tree", "Demo", "TREE Demo", "f54ac20d51c496911f9144ee595ade60", 1104691, Common::JA_JPN, 311),
 
-	WINDEMO1("trekfinalunity", "Demo", "PLAYDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370018, 310),
+	WINDEMO2("trekfinalunity", "Demo", "PLAYDEMO.EXE", "65d06b5fef155a2473434571aff5bc29", 370018,
+									   "LOGO.MMM",	   "347503372c22dc494f1762f5c6e262c3", 4358472, 310),
 
 	MACDEMO1_l("ttw", "Demo", "T.T.W.Demo", "51e8b81db434a6dcae723f6b7724143d", 691076, Common::JA_JPN, 302),
 	MACGAME1_l("ttw", "", "whales", "e184bbb4cc78e49733829ea7e2dc728a", 67777, Common::JA_JPN, 302),
@@ -2714,7 +2721,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	// Isaac Asimov's The Ultimate Robot CD-ROM
 	MACGAME1("ultrobotkit", "", "Robotoid Assembly", "1ae45c23586b41997ba52e2e7c771c4c", 1639801, 311),
-	WINGAME1("ultrobotkit", "", "TOOLKIT.EXE", "65d06b5fef155a2473434571aff5bc29", 1858955, 310),
+	WINGAME2("ultrobotkit", "", "TOOLKIT.EXE", "65d06b5fef155a2473434571aff5bc29", 1858955,
+								"BLANK.MMM",   "0c47901562a50baa79beb6a5e4504f15", 656, 310),
 	MACGAME1("ultrobotss", "", "Screen Saver Viewer", "2ce360c9ea2da80a2c6d1040b0ad92dd", 381980, 313),
 	WINDEMO1("ultrobot", "Demo", "ROBODEMO.EXE", "2b3543a9131a49f665982d26513a84f8", 373521, 310),
 


Commit: 7ff867bfc4a369912ac2c668d027bdada9b6b63d
    https://github.com/scummvm/scummvm/commit/7ff867bfc4a369912ac2c668d027bdada9b6b63d
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2022-12-02T15:07:27+01:00

Commit Message:
DIRECTOR: Improve detection for some D3 entries

* Victor Vector & Yondo games
* Woodstock 25 years
* Peanuts/Snoopy Y2L demos
* Snoopy Y2L

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 2476418f129..4908b788269 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -2741,22 +2741,30 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1("videocasino", "", "xn--Video Casino Sys. 6-co0l", "96936d0dbef06314515f134ccbbc35e1", 1488811, 310),
 	MACDEMO1("videocasino", "Demo", "VC.Demo.14.Start", "1ae45c23586b41997ba52e2e7c771c4c", 877609, 310),
 
-	MACGAME2("vvcyber", "", "Start Game", "7f443f2e63fd497a9ad85b10dc880a91", 384846,
-							"START0",	  "6d6781e7183df66d8995285e4e3f1a50", 807, 300),
-	WINGAME1("vvcyber", "", "CYBER.EXE", "65d06b5fef155a2473434571aff5bc29", 371139, 300),
-	MACDEMO1("vvcyber", "Demo", "CyberPlasm", "2ce360c9ea2da80a2c6d1040b0ad92dd", 503901, 300),
-	WINDEMO1t("vvcyber", "Demo", "CYBER.EXE", "f6a00141499568e167ab0ed901fffa05", 639439, 300),
-
-	MACGAME1("vvdinosaur", "", "Start Game", "d41d8cd98f00b204e9800998ecf8427e", -1, 300),
-	WINGAME1("vvdinosaur", "", "DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76", -1, 300),
-	WINGAME1("vvdinosaur", "v1.1", "DINOSAUR.EXE", "88f4f7406f34ec36e751a64f7c76f2c4", 370049, 300),
-
-	MACGAME1("vvharp", "", "Start Adventure! (8mb)", "7f443f2e63fd497a9ad85b10dc880a91", 383150, 300),
-	WINGAME1t("vvharp", "", "HYPNOTIC.EXE", "0cf51de2c038e003dd4046295e12a5d6", 370272, 300),
-
-	MACGAME1("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 300),
+	MACGAME2("vvcyber", "", "Start Game! (16Mb)", "7f443f2e63fd497a9ad85b10dc880a91", 384590,
+							"CH0MAC/START0",  "6d6781e7183df66d8995285e4e3f1a50", 551, 310),
+	WINGAME2t("vvcyber", "", "CYBER.EXE", "979fad26abe804c85c791d56d24d8935", 371139,
+							 "START0.MMM", "c6ad604fa2b61bf568bd4b00fa1a212a", 1126, 310),
+	MACDEMO1("vvcyber", "Demo", "CyberPlasm", "2ce360c9ea2da80a2c6d1040b0ad92dd", 503901, 310),
+	WINDEMO2t("vvcyber", "Demo", "CYBER.EXE", "f6a00141499568e167ab0ed901fffa05", 639439,
+								 "CYBER.MMM", "eaa81c1e5ee7229bca5f214f86337f3d", 270188, 310),
+
+//	MACGAME1("vvdinosaur", "", "Start Game", "d41d8cd98f00b204e9800998ecf8427e", -1, 300),
+	MACGAME2("vvdinosaur", "", "Start Adventure (8Mb)", 	  "2ce360c9ea2da80a2c6d1040b0ad92dd", 384984,
+							   "Dinosaur/Chapter1/LDE Intro", "4ae7c14351bc9cfd812c410ba37aecd3", 407023, 310),
+//	WINGAME1("vvdinosaur", "", "DINOSAUR.EXE", "4e6303630f4dd588e730d09241cf7e76", -1, 300),
+	WINGAME2t("vvdinosaur", "v1.1", "DINOSAUR.EXE", "d9a7b8248c831b9af1a0f3c43269d9d6", 370049,
+								    "STARTLDE.MMM", "87da46f4deaa55032ed54b3d366c272d", 792, 310),
+
+	MACGAME2("vvharp", "",  "Start Adventure! (8mb)", "7f443f2e63fd497a9ad85b10dc880a91", 383150,
+						    "Hypnotic/Chapter1/1_01", "827500ffd04e12fca366acdd5e03d83b", 1168697, 310),
+	WINGAME2t("vvharp", "", "HYPNOTIC.EXE", "0cf51de2c038e003dd4046295e12a5d6", 370272,
+							"START.MMM",	"cab5ffd61f5f547d2b7be44fe6b67c76", 954, 310),
+
+//	MACGAME1("vvvampire", "", "The Vampire's Coffin", "d41d8cd98f00b204e9800998ecf8427e", -1, 300),
 	MACGAME1("vvvampire", "", "The Vampire's Coffin", "7f443f2e63fd497a9ad85b10dc880a91", 384070, 313),
-	WINGAME1t("vvvampire", "", "VAMPIRE.EXE", "97019593c1c86ac3be60c3ba468c07b6", 370837, 300),
+	WINGAME2t("vvvampire", "", "VAMPIRE.EXE", "97019593c1c86ac3be60c3ba468c07b6", 370837,
+							   "START.MMM",	  "425df941db805b5599e37a1e7b1c4d59", 1584, 310),
 
 	MACGAME1_l("vvs", "", "VVS Theater-ExtraLarge", "f5277c53bacd27936158dd3867e587e2", 912651, Common::JA_JPN, 311),
 	MACDEMO1_l("vvs", "Demo", "VVS Theater", "f5277c53bacd27936158dd3867e587e2", 639512, Common::JA_JPN, 311),
@@ -2820,9 +2828,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 	// Original filename is WONDEROMPM4.5J Ver.2 ï½»ï¾ï¾Œï¾Ÿï¾™
 	MACDEMO1_l("wonderompm", "Sample Version", "WONDEROMPM4.5J Ver.2 sample", "f5277c53bacd27936158dd3867e587e2", 392318, Common::JA_JPN, 311),
 
-	WINGAME1("woodstock25", "",     "FESTIVAL.EXE", "65d06b5fef155a2473434571aff5bc29", 370006, 310),
-	WINDEMO1t("woodstock25", "Demo", "WDSTOCK.EXE",  "35aaa39965705c32d927a0c8fbed27af", 2099951, 310),
-	WINDEMO1t("woodstock25", "Demo", "WDSTOCK.EXE",  "dd8af0fd34231850dc0e0c88cb04aa66", 2474071, 310),
+	WINGAME2t("woodstock25", "",     "FESTIVAL.EXE", 		  "91505a118fd9384e3bdff6f4e518b1e5", 370006,
+									 "WDSTOCK/MAIN/INTROTIT", "5f667d6fb422c9100a6e45e189c84272", 279922, 310),
+	WINDEMO1t("woodstock25", "Demo", "WDSTOCK.EXE", 		  "35aaa39965705c32d927a0c8fbed27af", 2099951, 310),
+	WINDEMO1t("woodstock25", "Demo", "WDSTOCK.EXE",			  "dd8af0fd34231850dc0e0c88cb04aa66", 2474071, 310),
 
 	WINDEMO1("wpmainstreet", "", "WPMAINST.EXE", "65d06b5fef155a2473434571aff5bc29", 370000, 300),
 
@@ -2871,13 +2880,16 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	// from Yearn2Learn: Master Snoopy's Math
 	// English Mac demos are simply quicktime files, no director
-	WINDEMO1t("y2lpeanuts", "QuickTime Preview", "PEANUTS.EXE", "a9f24851955b9e260274cd9380254f5b", 370017, 310),
-	WINDEMO1t("y2lsnoopy", "QuickTime Preview", "SNOOPY.EXE", "6a1c5ea0d9870bacd2017e1f2267a743", 370016, 310),
+	WINDEMO2t("y2lpeanuts", "QuickTime Preview", "PEANUTS.EXE",  "a9f24851955b9e260274cd9380254f5b", 370017,
+												 "PNTSDEMO.MMM", "0b2d12348cc93d2cad1338d102d0011a", 1070, 310),
+	WINDEMO2t("y2lsnoopy", "QuickTime Preview",  "SNOOPY.EXE",   "6a1c5ea0d9870bacd2017e1f2267a743", 370016,
+												 "SNPYDEMO.MMM", "5c183b406bd582849c2944762a7f446a", 1066, 310),
 
 	// Original filename is ã‚¹ãƒŒãƒ¼ãƒ”ãƒ¼ Demo
 	MACDEMO1_l("y2lsnoopy", "v1.2 Demo", "Snoopy Demo", "1ae45c23586b41997ba52e2e7c771c4c", 402007, Common::JA_JPN, 311),
 
-	WINGAME1("y2lsnoopy", "", "SNOOPY.EXE", "65d06b5fef155a2473434571aff5bc29", 418576, 310),
+	WINGAME2t("y2lsnoopy", "", "SNOOPY.EXE", 		   "39b10174e67241af11ccb4cf08b6c741", 418576,
+							   "Y2LDATA/INTROANI.MMM", "c725cff357223fbfc3d534e7892b0118", 542438, 310),
 
 	// Requires installation from floppy disks
 	WINGAME1("y2lspelling", "v1.0 Floppy", "SPELLACE.EXE", "65d06b5fef155a2473434571aff5bc29", 438552, 310),


