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

[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:
d1f4824864 SCUMM: Add MI1 Lemonhead lines for the Mac CD versions too


Commit: d1f4824864dee41eaa716c871313badc498c4689
    https://github.com/scummvm/scummvm/commit/d1f4824864dee41eaa716c871313badc498c4689
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-08-10T22:05:02+02:00

Commit Message:
SCUMM: Add MI1 Lemonhead lines for the Mac CD versions too

The Mac CD versions that I have use the same GUI as the DOS CD version,
but don't have CD audio tracks for the music. (So there is no music for
the cannibal village.) The script to patch is identical to the DOS CD
version, but located four bytes earlier in the room resource.

Changed paths:
    engines/scumm/resource.cpp


diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 3c1b23b60a..73fe6a9e52 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -1840,6 +1840,16 @@ bool ScummEngine::tryPatchMI1CannibalScript(byte *buf, int size) {
 		lang[0] = 'E';
 		lang[1] = 'N';
 		lang[2] = 'G';
+
+		// The Macintosh resource is 4 bytes shorter, which affects
+		// the script offset as well. Otherwise, both Mac versions
+		// that I have are identical to the DOS CD version in this
+		// particular case.
+
+		if (_game.platform == Common::kPlatformMacintosh) {
+			expectedSize -= 4;
+			scriptOffset -= 4;
+		}
 		break;
 	case Common::IT_ITA:
 		expectedSize = 83211;