[Scummvm-git-logs] scummvm master -> 7a4f09504a390ab11e78517cd022f09b1e8679bf

[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:
7a4f09504a SCUMM: Quote Aric Wilmunder as to why the cliff puzzle was disabled in Monkey2 Towns


Commit: 7a4f09504a390ab11e78517cd022f09b1e8679bf
    https://github.com/scummvm/scummvm/commit/7a4f09504a390ab11e78517cd022f09b1e8679bf
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-08-08T12:15:19+02:00

Commit Message:
SCUMM: Quote Aric Wilmunder as to why the cliff puzzle was disabled in Monkey2 Towns

It appears that this was disabled on FM-TOWNS because of a vertical scrolling
limitation, but it appears to work fine, nonetheless. This is also what they
observed while doing the QA for the original PC version, and so they enabled
it again there.

Sources (with also some words from Dave and Tami!):

https://twitter.com/AWilmunder/status/1553827430699192320
https://www.timeextension.com/features/how-we-helped-solve-a-30-year-old-mystery-in-monkey-island-2-lechucks-revenge

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index f646902c0e7..e0ffa030a44 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -422,7 +422,10 @@ void ScummEngine_v5::o5_actorOps() {
 		{ 1, 0, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 20 };
 	// WORKAROUND bug #2233 "MI2 FM-TOWNS: Elaine's mappiece directly flies to treehouse"
 	// There's extra code inserted in script 45 from room 45 that caused that behaviour,
-	// the code below just skips the extra script code.
+	// the code below just skips the extra script code.  As confirmed by Aric Wilmunder,
+	// "the fishing pole puzzle had been removed for the Towns because vertical scrolling
+	// hadn't been implemented", but it appears to work nonetheless, which is what they
+	// also observed when doing the QA for the PC version.
 	if (_game.id == GID_MONKEY2 && _game.platform == Common::kPlatformFMTowns &&
 		vm.slot[_currentScript].number == 45 && _currentRoom == 45 &&
 		(_scriptPointer - _scriptOrgPointer == 0xA9) && _enableEnhancements) {