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

[eriktorbjorn]

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

Summary:
b59d22dd09 GRIM: Add English Mac EMI detection entry


Commit: b59d22dd09e64568daedaa986798f0db5255e906
    https://github.com/scummvm/scummvm/commit/b59d22dd09e64568daedaa986798f0db5255e906
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-07-25T20:25:11+02:00

Commit Message:
GRIM: Add English Mac EMI detection entry

The game crashes almost immediately for me, though.

Changed paths:
    engines/grim/detection.cpp
    engines/grim/md5check.cpp


diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp
index 2020e7cd958..53fd3cdab22 100644
--- a/engines/grim/detection.cpp
+++ b/engines/grim/detection.cpp
@@ -511,6 +511,20 @@ static const GrimGameDescription gameDescriptions[] = {
 		},
 		GType_MONKEY4
 	},
+	{
+		// Escape from Monkey Island English (Mac)
+		{
+			"monkey4",
+			"",
+			AD_ENTRY2s("artAll.m4b",	 "61959da91d864bf5f4588daa4a5a3019", 18515664,
+					   "Monkey Island 4 Installer", "r:8230927789935674546c4b3f9b1368ea", 560139),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_UNSTABLE,
+			GUI_OPTIONS_GRIME
+		},
+		GType_MONKEY4
+	},
 	{
 		// Escape from Monkey Island German (Mac)
 		{
diff --git a/engines/grim/md5check.cpp b/engines/grim/md5check.cpp
index c6bc843e5df..a0224de7ef2 100644
--- a/engines/grim/md5check.cpp
+++ b/engines/grim/md5check.cpp
@@ -408,6 +408,9 @@ const char *emid_voice[] = {
 	"7f9867d48b5e0af5cb3fbd8d79741f5d", // english patched
 };
 
+// FIXME: We should check the MD5 of the resource and data forks, not of the
+// particular dump.
+
 // EMI Macintosh
 const char *emi_installer[] = {
 	"93a639e3221405862dc46e9706216c00", // German (EFMI Installer)
@@ -523,7 +526,11 @@ void MD5Check::init() {
 			MD5SUM("artMel.m4b", emi_artMel)
 			MD5SUM("artMon.m4b", emi_artMon)
 			MD5SUM("lip.m4b", emi_lip)
-			MD5SUM("local.m4b", emi_local)
+			// At least in the English version, this appears to be part of the
+			// installer.
+			if (g_grim->getGameLanguage() != Common::EN_ANY) {
+				MD5SUM("local.m4b", emi_local)
+			}
 			MD5SUM("sfx.m4b", emi_sfx)
 			MD5SUM("voiceAll.m4b", emi_voiceAll)
 			MD5SUM("voiceJam.m4b", emi_voiceJam)