[Scummvm-git-logs] scummvm master -> 88d0978a8674e51b575b22308a9c060e9b4abd16

[dwatteau]

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:
88d0978a86 SCUMM: Mention that Monkey1-Amiga already has the fix for the map at Meathook's


Commit: 88d0978a8674e51b575b22308a9c060e9b4abd16
    https://github.com/scummvm/scummvm/commit/88d0978a8674e51b575b22308a9c060e9b4abd16
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-09-03T01:44:35+02:00

Commit Message:
SCUMM: Mention that Monkey1-Amiga already has the fix for the map at Meathook's

Now, the workaround is written in a way as not to cause any problem if
the fix is already included in a release, and since several Amiga
releases may exist, it makes no sense to exclude this port from this
check.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index e363726f068..f22f5b88eba 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1529,6 +1529,9 @@ void ScummEngine_v5::o5_isEqual() {
 	// causes various issues. The CD release prevented this by making
 	// Guybrush say "I don't need to look at a map right now." instead, so
 	// backport this fix to the floppy EGA/VGA releases.
+	//
+	// (It looks like the (or some?) Amiga releases already have this
+	// fix, but it's written in a way so that it can't hurt.)
 	if ((_game.id == GID_MONKEY_EGA || _game.id == GID_MONKEY_VGA) && _currentScript != 0xFF && vm.slot [_currentScript].number == 120 && var == VAR_ROOM && b == 29) {
 		// In Meathook's house; check is missing from both EGA and VGA SCUMMv4
 		// releases. It can cause a fatal "ERROR: (63:49:0x14A): Local script 207