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

[bluegr]

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:
d06c6006f6 SCUMM: Add enhancement for missing message when entering ship's hold


Commit: d06c6006f6a86ad86c97a16fe58e07b7ff28c242
    https://github.com/scummvm/scummvm/commit/d06c6006f6a86ad86c97a16fe58e07b7ff28c242
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-04-07T20:30:27+03:00

Commit Message:
SCUMM: Add enhancement for missing message when entering ship's hold

The first time Guybrush enters the ship's hold, there is a message where
he remarks that the whole thing reeks of monkeys. But the way it's
scripted, it's only shown if it has already been shown. We can enable
the message by inverting the check.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 83da387c710..42b36f8d660 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1738,7 +1738,17 @@ void ScummEngine_v5::o5_notEqualZero() {
 			}
 		}
 	} else {
-		a = getVar();
+		int var = fetchScriptWord();
+		a = readVar(var);
+
+		// WORKAROUND: There is a message for when Guybrush first
+		// enters the hold where he remarks that the whole thing reeks
+		// of monkeys. But the way it's scripted, the message is only
+		// shown if it has already been shown.
+
+		if ((_game.id == GID_MONKEY || _game.id == GID_MONKEY_VGA || _game.id == GID_MONKEY_EGA) && _roomResource == 8 && vm.slot[_currentScript].number == 10002 && var == 0x8000 + 321 && enhancementEnabled(kEnhRestoredContent)) {
+			a = !a;
+		}
 	}
 
 	jumpRelative(a != 0);