[Scummvm-git-logs] scummvm master -> 96eef456d334cc4f551404fa9256195d28f5a32a

[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:
96eef456d3 SCUMM: Differentiate between Mac and DOS versions of MI2


Commit: 96eef456d334cc4f551404fa9256195d28f5a32a
    https://github.com/scummvm/scummvm/commit/96eef456d334cc4f551404fa9256195d28f5a32a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-11-09T12:18:25+01:00

Commit Message:
SCUMM: Differentiate between Mac and DOS versions of MI2

The Mac version has no aspect ratio correction, no EGA rendering, and
only Macintosh audio.

Changed paths:
    devtools/scumm-md5.txt
    engines/scumm/detection_tables.h
    engines/scumm/scumm-md5.h


diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index e050de54e4f..1d10eb4e1a7 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -290,8 +290,8 @@ monkey2	Monkey Island 2: LeChuck's Revenge
 	69ea626f1f87eecb78ea0d6c6b983a1d	-1	it	DOS	-	-	-	Andrea Petrucci
 	bd126753de619a495f9f22adc951c8d5	11135	it	DOS	-	-	alt?	Andrea Petrucci
 	7974365d3dc0f43a2748c975f91ff042	11135	es	DOS	-	-	-	Andrea Petrucci
-	4cb9c3618f71668f8e4346c8f323fa82	10700	en	Mac	-	-	v1.0 11/5/92	Fingolfin
-	e246e02db9630533a40d99c9f54a8e01	10740	en	Mac	-	-	v1.0 11/5/92 alt?	Lars Næsbye Christensen
+	4cb9c3618f71668f8e4346c8f323fa82	10700	en	Mac	Mac	-	v1.0 11/5/92	Fingolfin
+	e246e02db9630533a40d99c9f54a8e01	10740	en	Mac	Mac	-	v1.0 11/5/92 alt?	Lars Næsbye Christensen
 
 	da09e666fc8f5b78d7b0ac65d1a3b56e	11135	en	FM-TOWNS	FM-TOWNS	-	-	dhewg, Andrea Petrucci
 	430bc518017b6fac046f58bab6baad5d	11135	jp	FM-TOWNS	FM-TOWNS	-	-	Antti Leimi, Andrea Petrucci
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index f394bee710b..0df306840eb 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -200,6 +200,7 @@ static const GameSettings gameVariantsTable[] = {
 	{"monkey2", "", 0, GID_MONKEY2,  5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO5(GUIO_NOSPEECH, GUIO_RENDEREGA, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI, GAMEOPTION_COPY_PROTECTION)},
 	{"monkey2", "Demo", 0, GID_MONKEY2,  5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_DEMO, UNK, GUIO2(GUIO_NOSPEECH, GAMEOPTION_ENHANCEMENTS)},
 	{"monkey2", "Amiga", 0, GID_MONKEY2,  5, 0, MDT_AMIGA, 0, Common::kPlatformAmiga, GUIO5(GUIO_NOSPEECH, GUIO_MIDIAMIGA, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI, GAMEOPTION_COPY_PROTECTION)},
+	{"monkey2", "Mac", 0, GID_MONKEY2,  5, 0, MDT_MACINTOSH, 0, UNK, GUIO5(GUIO_NOSPEECH, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI, GAMEOPTION_COPY_PROTECTION, GUIO_NOASPECT)},
 	{"monkey2", "FM-TOWNS", 0, GID_MONKEY2,  5, 0, MDT_PCSPK | MDT_TOWNS | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, Common::kPlatformFMTowns, GUIO7(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_MIDIADLIB, GUIO_MIDIMT32, GAMEOPTION_TRIM_FMTOWNS_TO_200_PIXELS, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI)},
 	{"monkey2", "SE Talkie",0, GID_MONKEY2,  5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, GF_ULTIMATE_TALKIE, UNK, GUIO2(GUIO_RENDEREGA, GAMEOPTION_ORIGINALGUI)},
 	{"atlantis", "", 0, GID_INDY4,    5, 0, MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32, 0, UNK, GUIO3(GUIO_RENDEREGA, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI)},
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 0e900150b6c..6979072b68e 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Fri Nov 08 18:32:16 2024
+  This file was generated by the md5table tool on Sat Nov  9 09:31:24 2024
   DO NOT EDIT MANUALLY!
  */
 
@@ -256,7 +256,7 @@ static const MD5Table md5table[] = {
 	{ "4bedb49943df95a9c900a5a82ccbe9de", "ft", "", "", 19752, Common::FR_FRA, Common::kPlatformUnknown },
 	{ "4bfa4a43684bcb437f7fb47f457a0aa5", "socks", "HE 99", "", 13668, Common::NL_NLD, Common::kPlatformUnknown },
 	{ "4c4820518e16e1a0e3616a3b021a04f3", "catalog", "HE CUP", "Preview", 10927456, Common::DE_DEU, Common::kPlatformUnknown },
-	{ "4cb9c3618f71668f8e4346c8f323fa82", "monkey2", "", "", 10700, Common::EN_ANY, Common::kPlatformMacintosh },
+	{ "4cb9c3618f71668f8e4346c8f323fa82", "monkey2", "Mac", "", 10700, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "4ce2d5b355964bbcb5e5ce73236ef868", "freddicove", "HE 100", "", 41182, Common::RU_RUS, Common::kPlatformWindows },
 	{ "4cfd3fda4a4e6e64a1fc488eba973b7a", "fbpack", "", "", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "4d34042713958b971cb139fba4658586", "atlantis", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
@@ -701,7 +701,7 @@ static const MD5Table md5table[] = {
 	{ "e17db1ddf91b39ca6bbc8ad3ed19e883", "monkey", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
 	{ "e1c9998826ce7fa8bde5cc3a5023edec", "moonbase", "1.1", "1.1", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "e222c2020a6e6a93bc13d01224ab73df", "monkey", "VGA", "VGA", 8357, Common::RU_RUS, Common::kPlatformDOS },
-	{ "e246e02db9630533a40d99c9f54a8e01", "monkey2", "", "", 10740, Common::EN_ANY, Common::kPlatformMacintosh },
+	{ "e246e02db9630533a40d99c9f54a8e01", "monkey2", "Mac", "", 10740, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "e361a7058ed8e8ebb462663c0a3ae8d6", "puttputt", "HE 62", "", -1, Common::HE_ISR, Common::kPlatformDOS },
 	{ "e3f1f2b6ca7b55076782872cb8ff0985", "freddi", "HE 71", "Demo", 9779, Common::EN_ANY, Common::kPlatformWindows },
 	{ "e41de1c2a15abbcdbf9977e2d7e8a340", "freddi2", "HE 100", "Updated", 65489, Common::RU_RUS, Common::kPlatformWindows },