[Scummvm-git-logs] scummvm master -> 37874021c3f7a2acae7c33487120d6394c4630e3

sev- noreply at scummvm.org
Thu Dec 14 17:18:40 UTC 2023 

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

Summary:
567240f6ef MOHAWK: Fix Alien Tales demo game type
ac3342b1b0 MOHAWK: Add detection for Maths Workshop US and EU
29c012a60d MOHAWK: Add detection for Write, Camera, Action!
e934deaaaf MOHAWK: Add detection for The Amazing Writing Machine
f8935d41be MOHAWK: Add detection for Maths Workshop Deluxe (US)
55efcfdffc MOHAWK: Add detection for harryhh and lilmonster EN+ES Mac demos
37874021c3 MOHAWK: Add detection for Japanese Mac Harry and the Haunted House


Commit: 567240f6efe209fe0af3e0562d75aa00dd6efe7f
    https://github.com/scummvm/scummvm/commit/567240f6efe209fe0af3e0562d75aa00dd6efe7f
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Fix Alien Tales demo game type

Changed paths:
    engines/mohawk/detection_tables.h


diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 7d8fb9360b2..fc72ad83dc0 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -916,7 +916,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_UNSUPPORTED | ADGF_DEMO,
 			GUIO1(GUIO_NOASPECT)
 		},
-		GType_ORLY,
+		GType_ALIENTALES,
 		0,
 		0
 	},


Commit: ac3342b1b08553a14e3cf191a51b0f8f5fd45924
    https://github.com/scummvm/scummvm/commit/ac3342b1b08553a14e3cf191a51b0f8f5fd45924
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Add detection for Maths Workshop US and EU

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


diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index a612088a852..7752410531b 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -74,6 +74,7 @@ static const PlainGameDescriptor mohawkGames[] = {
 	{"drseussreading", "Dr. Seuss Reading Games"},
 	{"arthurreading", "Arthur's Reading Games"},
 	{"wsg", "Williams-Sonoma Guide to Good Cooking" },
+	{"mathsworkshop", "Maths Workshop" },
 	{nullptr, nullptr}
 };
 
diff --git a/engines/mohawk/detection.h b/engines/mohawk/detection.h
index e16dccda188..463d108831e 100644
--- a/engines/mohawk/detection.h
+++ b/engines/mohawk/detection.h
@@ -45,6 +45,7 @@ enum MohawkGameType {
 	GType_CSUSA,
 	GType_ORLY,
 	GType_ALIENTALES,
+	GType_MATHSWORKSHOP,
 };
 
 #define GAMEOPTION_ME   GUIO_GAMEOPTIONS1
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index fc72ad83dc0..637340c49d0 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -965,6 +965,69 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// Maths Workshop US
+	// Win/Mac
+	{
+		{
+			"mathsworkshop",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("MAINSCRN.DAT", "5fc18dc4e12ed4988182af17d1f1cf8c", 10972138),
+			Common::EN_USA,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_MATHSWORKSHOP,
+		0,
+		0
+	},
+
+	// Maths Workshop EU
+	// Win/Mac
+	// Has all languages as separate .DAE (English), .DAD (German), .DAF (French) files
+	{
+		{
+			"mathsworkshop",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("MAINSCRN.DAE", "f42b70727bb3d5b224c85735339d4489", 7751154),
+			Common::EN_GRB,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_MATHSWORKSHOP,
+		0,
+		0
+	},
+	{
+		{
+			"mathsworkshop",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("MAINSCRN.DAD", "9d75b524de80ac99e6ef43e679c97340", 7748061),
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_MATHSWORKSHOP,
+		0,
+		0
+	},
+	{
+		{
+			"mathsworkshop",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("MAINSCRN.DAF", "260ba9aec6c16b3aee6377afe7e212e6", 7667595),
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_MATHSWORKSHOP,
+		0,
+		0
+	},
+
 	// Harry and the Haunted House v1.0E
 	// English Windows 3.11
 	// From strangerke


Commit: 29c012a60de9c07722d8c58b7d0f01fa117c49d3
    https://github.com/scummvm/scummvm/commit/29c012a60de9c07722d8c58b7d0f01fa117c49d3
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Add detection for Write, Camera, Action!

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


diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 7752410531b..b5936307fc8 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -75,6 +75,7 @@ static const PlainGameDescriptor mohawkGames[] = {
 	{"arthurreading", "Arthur's Reading Games"},
 	{"wsg", "Williams-Sonoma Guide to Good Cooking" },
 	{"mathsworkshop", "Maths Workshop" },
+	{"wricamact", "Write, Camera, Action!"},
 	{nullptr, nullptr}
 };
 
diff --git a/engines/mohawk/detection.h b/engines/mohawk/detection.h
index 463d108831e..c24394246f4 100644
--- a/engines/mohawk/detection.h
+++ b/engines/mohawk/detection.h
@@ -46,6 +46,7 @@ enum MohawkGameType {
 	GType_ORLY,
 	GType_ALIENTALES,
 	GType_MATHSWORKSHOP,
+	GType_WRICAMACT,
 };
 
 #define GAMEOPTION_ME   GUIO_GAMEOPTIONS1
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 637340c49d0..cfdd5501e9a 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1028,6 +1028,23 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// Write, Camera, Action!
+	// Mac/Win hybrid disc
+	{
+		{
+			"wricamact",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("SYSTEM.MHK", "ed7dec6e3a5d3a5f74307faaf12242bf", 460),
+			Common::FR_FRA,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_WRICAMACT,
+		0,
+		0
+	},
+
 	// Harry and the Haunted House v1.0E
 	// English Windows 3.11
 	// From strangerke


Commit: e934deaaaf444287c5c199203c745e8c00daab1f
    https://github.com/scummvm/scummvm/commit/e934deaaaf444287c5c199203c745e8c00daab1f
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Add detection for The Amazing Writing Machine

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


diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index b5936307fc8..120d0638d91 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -76,6 +76,7 @@ static const PlainGameDescriptor mohawkGames[] = {
 	{"wsg", "Williams-Sonoma Guide to Good Cooking" },
 	{"mathsworkshop", "Maths Workshop" },
 	{"wricamact", "Write, Camera, Action!"},
+	{"amazingwriting", "The Amazing Writing Machine"},
 	{nullptr, nullptr}
 };
 
diff --git a/engines/mohawk/detection.h b/engines/mohawk/detection.h
index c24394246f4..8dbe8dd8647 100644
--- a/engines/mohawk/detection.h
+++ b/engines/mohawk/detection.h
@@ -47,6 +47,7 @@ enum MohawkGameType {
 	GType_ALIENTALES,
 	GType_MATHSWORKSHOP,
 	GType_WRICAMACT,
+	GType_AMAZINGWRITING,
 };
 
 #define GAMEOPTION_ME   GUIO_GAMEOPTIONS1
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index cfdd5501e9a..58b64a2f3db 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1045,6 +1045,23 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// The Amazing Writing Machine
+	// Mac/Win hybrid disc
+	{
+		{
+			"amazingwriting",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("system.dat", "h:6d65aa2cc7d437bb352aa18c0d63e332", 131),
+			Common::FR_FRA,
+			Common::kPlatformMacintosh,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_AMAZINGWRITING,
+		0,
+		0
+	},
+
 	// Harry and the Haunted House v1.0E
 	// English Windows 3.11
 	// From strangerke


Commit: f8935d41be5159c89336c77592d3647ee99bb996
    https://github.com/scummvm/scummvm/commit/f8935d41be5159c89336c77592d3647ee99bb996
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Add detection for Maths Workshop Deluxe (US)

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


diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index 120d0638d91..cac036cf895 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -75,6 +75,7 @@ static const PlainGameDescriptor mohawkGames[] = {
 	{"arthurreading", "Arthur's Reading Games"},
 	{"wsg", "Williams-Sonoma Guide to Good Cooking" },
 	{"mathsworkshop", "Maths Workshop" },
+	{"mathsworkshopdx", "Maths Workshop Deluxe" },
 	{"wricamact", "Write, Camera, Action!"},
 	{"amazingwriting", "The Amazing Writing Machine"},
 	{nullptr, nullptr}
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 58b64a2f3db..0d0fdb5316e 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1028,6 +1028,24 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	// Maths Workshop Deluxe US
+	// Win/Mac
+	{
+		{
+			"mathsworkshopdx",
+			_s("Missing game code"), // Reason for being unsupported,
+			AD_ENTRY1s("MAINSCRN.DAT", "338563e58ac1313bc7606c5584a3576a", 7756078),
+			Common::EN_USA,
+			Common::kPlatformWindows,
+			ADGF_UNSUPPORTED,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_MATHSWORKSHOP,
+		0,
+		0
+	},
+
+
 	// Write, Camera, Action!
 	// Mac/Win hybrid disc
 	{


Commit: 55efcfdffc0c70fc85efd235fea4f16a289e1514
    https://github.com/scummvm/scummvm/commit/55efcfdffc0c70fc85efd235fea4f16a289e1514
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Add detection for harryhh and lilmonster EN+ES Mac demos

Changed paths:
    engines/mohawk/detection_tables.h


diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 0d0fdb5316e..ced0b9da51d 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1216,6 +1216,23 @@ static const MohawkGameDescription gameDescriptions[] = {
 		"HARRY.EXE"
 	},
 
+	// English / Spanish demo
+	// from einstein95
+	{
+		{
+			"harryhh",
+			"Demo English/Spanish",
+			AD_ENTRY1s("Harry & the Haunted House Demo", "42b5171277e7dee1edd47812f85760af", 622),
+			Common::UNK_LANG,
+			Common::kPlatformMacintosh,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV1,
+		0,
+		"Living Books Player"
+	},
+
 	// part of "Super Living Books" compilation
 	// from rgemini, bug #5726
 	{
@@ -3017,6 +3034,24 @@ static const MohawkGameDescription gameDescriptions[] = {
 		"MONSTER.EXE"
 	},
 
+	// English / Spanish demo
+	// from einstein95
+	{
+		{
+			"lilmonster",
+			"Demo English/Spanish",
+			AD_ENTRY1s("Little Monster at School Demo", "52eee4e6ea83ff494765d92affe5613e", 622),
+			Common::UNK_LANG,
+			Common::kPlatformMacintosh,
+			ADGF_DEMO,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV1,
+		0,
+		"Living Books Player"
+	},
+
+
 	{
 		{
 			"catinthehat",


Commit: 37874021c3f7a2acae7c33487120d6394c4630e3
    https://github.com/scummvm/scummvm/commit/37874021c3f7a2acae7c33487120d6394c4630e3
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2023-12-14T18:18:34+01:00

Commit Message:
MOHAWK: Add detection for Japanese Mac Harry and the Haunted House

Changed paths:
    engines/mohawk/detection_tables.h


diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index ced0b9da51d..f9d82f4b6c0 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -1250,6 +1250,25 @@ static const MohawkGameDescription gameDescriptions[] = {
 		"HARRY.EXE"
 	},
 
+	// from herb via Discord
+	// Living Books Player v1.7J
+	// Do not use GType_LIVINGBOOKSV1, otherwise Option button on title causes script error
+	// Also contains English and Spanish, but title and options will still be Japanese
+	{
+        {
+			"harryhh",
+			"",
+			AD_ENTRY1s("BookOutline", "1780f04a72fbae2eee7ac796aa51c630", 3622),
+			Common::JA_JPN,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			GUIO1(GUIO_NOASPECT)
+		},
+		GType_LIVINGBOOKSV2,
+		0,
+		"ハリー君とおばけやしき"
+	},
+
 	{
 		{
 			"carmentq",

More information about the Scummvm-git-logs mailing list