[Scummvm-git-logs] scummvm master -> 5490d68e435eb2a04a93c50e64720161f9000e0c

tag2015 noreply at scummvm.org
Sun Mar 26 18:21:31 UTC 2023 

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:
9ce43bf498 DIRECTOR: Complete detection of cattheripper
5490d68e43 DIRECTOR: Fix a few entries and remove unneeded globs


Commit: 9ce43bf4980ae32772bb926c42f322a9c8c8c6f7
    https://github.com/scummvm/scummvm/commit/9ce43bf4980ae32772bb926c42f322a9c8c8c6f7
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-03-26T20:21:05+02:00

Commit Message:
DIRECTOR: Complete detection of cattheripper

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index cfde56b399a..ade37bdea26 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -3366,7 +3366,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACGAME1("catseyeview", "Vol. 3", "Cat'sEyeView vol.3", "2c94dee7ddad3e6b47c7d62565286007", 484095, 404),
 	WINGAME1("catseyeview", "Vol. 3", "CatsEyeView3.exe", "9ba8ac33552a3053cb1f23679422775e", 1900433, 404),
 
-	WINGAME1t_l("cattheripper", "", "CAT.EXE", "cff4ae8f3e57a00664c1b477a634e708", 748205, Common::JA_JPN, 404),
+	WINGAME2_l("cattheripper", "CD 1", "CAT/CAT.EXE", "t:cff4ae8f3e57a00664c1b477a634e708", 748205,
+								   	   "CAT/OP2.DIR", "t:8592bfff06139adb0cecb8b7ee087068", 693042, Common::JA_JPN, 404),
+	WINGAME2_l("cattheripper", "CD 2", "CAT/CAT.EXE", "t:cff4ae8f3e57a00664c1b477a634e708", 748159,
+								   	   "CAT/OP2.DIR", "t:8592bfff06139adb0cecb8b7ee087068", 693042, Common::JA_JPN, 404),
 
 	MACGAME1("cbible", "", "Children's Bible Stories", "17efee018a660458fae80de4364021ac", 483490, 404),
 	WINGAME1("cbible", "", "CBIBLE.EXE", "d408f781d32337f8a5a9b3655c7d7803", 1727225, 404),


Commit: 5490d68e435eb2a04a93c50e64720161f9000e0c
    https://github.com/scummvm/scummvm/commit/5490d68e435eb2a04a93c50e64720161f9000e0c
Author: Walter Agazzi (walter.agazzi at protonmail.com)
Date: 2023-03-26T20:21:05+02:00

Commit Message:
DIRECTOR: Fix a few entries and remove unneeded globs

Changed paths:
    engines/director/detection_paths.h
    engines/director/detection_tables.h


diff --git a/engines/director/detection_paths.h b/engines/director/detection_paths.h
index 7b7348323c2..c626c28c8c2 100644
--- a/engines/director/detection_paths.h
+++ b/engines/director/detection_paths.h
@@ -29,8 +29,6 @@ const char *directoryGlobs[] = {
 	"win_data",						// L-ZONE
 	"data",
 	"gadget",						// Gadget
-	"vnc",
-	"vnc2",							// Virtual Nightclub
 	"program",						// Arc Media products
 	"demodata",						// Edmark demos
 	"media",						// Gundam
@@ -39,10 +37,8 @@ const char *directoryGlobs[] = {
 	"module_2",						// Takeru
 	"simpdata",
 	"simpsons",						// Simpsons Cartoon Studio
-	"dane",							// Polish Kontyngent '99 catalog
 	"datas",						// O!KAY! subscription from Domino Verlag
 	"daten",						// Bibi Blocksberg games (German)
-	"source",						// Grand Prix 2006 directory
 	"data_k",
 	"data_1",
 	"data_2",						// JumpStart World
@@ -80,7 +76,6 @@ const char *directoryGlobs[] = {
 	"polis",
 	"poliisi",
 	"cd_data",						// Polis
-	"fusion macintosh folder",		// Fusion
 	"oslo",							// Oslo's Tools & Gadgets
 	"ojo2000",
 	"stuff",						// Abrapalabra
@@ -95,7 +90,6 @@ const char *directoryGlobs[] = {
 	"dayfiles",
 	"xmasfun",						// Fisher-Price Xmas Fun
 	"95instal",						// Fisher-Price Little People
-	"01",					   		// Doing it in C++
 	"freading",
 	"fsetup",						// My First Reading Words (Eureka)
 	"english",
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index ade37bdea26..c5c87286562 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -3484,8 +3484,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINGAME1("crybaby", "", "crybaby.exe", "e67c787e86a948dcac23fd0d533f53ab", 1211165, 404),
 
 	// From Personal Computer World (UK) disc no. 4 - Dec 1996
-	WINDEMO2("ctrain", "Demo", "DEMO.EXE", "d8226e09cff86cece90b52bc9eeaac7b", 1585550,
-							   "01.DIR",   "63a263078c15a7352a3a6c0494e1d304", 1374398, 404),
+	WINDEMO2("ctrain", "Demo", "DEMO.EXE",  "d:d8226e09cff86cece90b52bc9eeaac7b", 1585550,
+							   "01/01.DIR", "d:63a263078c15a7352a3a6c0494e1d304", 1374398, 404),
 
 	// Curio City (キュリオ シティ) is a quarterly series of virtual mall and entertainment CD-ROMs
 	// issued by Mitsui & Co. to promote its Curio City shopping services.
@@ -5267,9 +5267,12 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINDEMO1t("vote", "Demo", "VOTEDEMO.EXE", "9730557013fd18686943f3787c030f23", 7679955, 404),
 
-	MACGAME1("vnc", "", "VNC", "0c7bbb4b24823e5ab871cb4c1d6f3710", 486116, 404),
-	WINGAME1("vnc", "", "VNC.EXE", "40ba00213a10164eb6e01847108f9b21", 1086869, 404),
-	WINGAME1("vnc", "Beta", "VNC.EXE", "e6f284971c09f19e3277aa8ebcf58cbd", 726643, 404),
+	MACGAME2("vnc", "", "VNC/VNC", 		   "r:0c7bbb4b24823e5ab871cb4c1d6f3710", 485860,
+						"VNC2/SHARED.Dxr", "d:f215be3e2d40e68035725c14b262e9f5", 4525536, 404),
+	WINGAME2("vnc", "", "VNC/VNC.EXE",	   "d:40ba00213a10164eb6e01847108f9b21", 1086869,
+						"VNC2/SHARED.DXR", "d:f215be3e2d40e68035725c14b262e9f5", 4525536, 404),
+	WINGAME2("vnc", "Beta", "VNC/VNC.EXE", 	   "d:e6f284971c09f19e3277aa8ebcf58cbd", 726643,
+							"VNC2/SHARED.DIR", "d:e3145060a7349e99e5b7ceffef000bad", 2782000, 404),
 
 	// Mac version requires installation, 'Install Voodoo Lounge', StuffIt
 	MACGAME1("voodoolounge",  "",	   "Voodoo Lounge", "b7e69c37b7355022d400c14aa97c5d54", 502080, 404),
@@ -6836,8 +6839,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACDEMO1("fpready1", "Acorn Arcade Demo v1.0w", "1st Grade Demo", "c387e039049babcadf92d4e104136735", 1031912, 602),
 	WINDEMO1t("fpready1", "Acorn Arcade Demo v1.0w", "FIRST95.EXE", "8095efb3ed13755b7ebbe2e0d61f1821", 1498587, 602),
 
-	MACGAME1("fusion", "", "Start FUSION Mac", "3849d7cd0cdbe4f46333879cbed56492", 1029165, 600),
-	WINGAME1("fusion", "", "FUSION.exe", "518a98696fe1122e08410b0f157f21bf", 1513751, 602),
+	MACGAME2("fusion", "", "FUSION Macintosh folder/Start FUSION Mac", "r:3849d7cd0cdbe4f46333879cbed56492", 1028909,
+						   "FUS_DATA/A_INTRO.Dxr",					   "d:e6e7042dc739d42254bdbe5b74e26f0d", 481228, 600),
+	WINGAME2("fusion", "", "FUSION.exe", 							   "d:518a98696fe1122e08410b0f157f21bf", 1513751,
+						   "FUS_DATA/A_INTRO.Dxr",					   "d:e6e7042dc739d42254bdbe5b74e26f0d", 481228, 600),
 
 	// Contains previews for educational and religious products for children and adults
 	// Miscellaneous section contains an art package and an encyclopedia on pregnancy and birth
@@ -6997,8 +7002,8 @@ static const DirectorGameDescription gameDescriptions[] = {
 
 	WINGAME1("kingandi", "", "King&I.exe", "518a98696fe1122e08410b0f157f21bf", 1967220, 602),
 
-	WINGAME2_l("kontyngent99", "", "START.EXE", "d62438566e44826960fc16c5c23dbe43", 1513041,
-								   "MAIN.DXR",	"98b4f7339e1f8f6628035e6317f78912", 21043440, Common::PL_POL, 650),
+	WINGAME2_l("kontyngent99", "", "START.EXE",		"d:d62438566e44826960fc16c5c23dbe43", 1513041,
+								   "DANE/MAIN.DXR",	"d:98b4f7339e1f8f6628035e6317f78912", 21043440, Common::PL_POL, 650),
 
 	// Published by Future Soft of Nasr City, Cairo
 	WINGAME1_l("ktaralarkam", "", "123.exe", "a593079aecf5bd938ce75264cac24b2d", 2748951, Common::AR_ARB, 600),
@@ -8388,9 +8393,10 @@ static const DirectorGameDescription gameDescriptions[] = {
 	WINGAME1_l("garygadget5", "",     "WillyRaumschiff.exe", "6b9dc16e1d307150bfec28729b59a523", 2185322, Common::DE_DEU, 900),
 	WINGAME1_l("garygadget5", "",     "Miel5.exe",           "7202313e2b177197b62e84dcf24d1292", 4253422, Common::NL_NLD, 900),
 
-	MACGAME2("gp2006", "", "CLICK ME",	"d483e955df901222145267d2ad729ea2", 233800,
-						   "Intro.cxt", "c7d1f703b3cfa4d134f601d17f8563a1", 673544, 900),
-	WINGAME1("gp2006", "", "CLICK_ME.EXE", "c612aa43e7ef55aa4fd2e1085fb1ef7a", 2182372, 900),
+	MACGAME2("gp2006", "", "CLICK ME",		   "r:d483e955df901222145267d2ad729ea2", 233544,
+						   "SOURCE/Intro.cxt", "d:c7d1f703b3cfa4d134f601d17f8563a1", 673544, 900),
+	WINGAME2("gp2006", "", "CLICK_ME.EXE", 	   "d:c612aa43e7ef55aa4fd2e1085fb1ef7a", 2182372,
+						   "SOURCE/Intro.cxt", "d:976a238d9dce0ea4a6544cf1fd2bd2fc", 673416, 900),
 
 	// Language selection in German, English, French
 	// Use Mac OS X executable in osx folder on disc

More information about the Scummvm-git-logs mailing list