[Scummvm-git-logs] scummvm master -> 13167eccc6a16acaac6c560258a0283a67c50702

[AndywinXp]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d5ad765ad7 SCUMM: MONKEY2: Mark workaround introduced in PR #1343 as enhancement
13167eccc6 NEWS: Mention workaround for Monkey Island 2 being marked as enhancement


Commit: d5ad765ad7a02e36a0f38be261be63caa342cb56
    https://github.com/scummvm/scummvm/commit/d5ad765ad7a02e36a0f38be261be63caa342cb56
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-06-14T00:20:29+02:00

Commit Message:
SCUMM: MONKEY2: Mark workaround introduced in PR #1343 as enhancement

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 38e83dd5d69..97639838ab0 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -425,7 +425,7 @@ void ScummEngine_v5::o5_actorOps() {
 	// the code below just skips the extra script code.
 	if (_game.id == GID_MONKEY2 && _game.platform == Common::kPlatformFMTowns &&
 		vm.slot[_currentScript].number == 45 && _currentRoom == 45 &&
-		(_scriptPointer - _scriptOrgPointer == 0xA9)) {
+		(_scriptPointer - _scriptOrgPointer == 0xA9) && _enableEnhancements) {
 		_scriptPointer += 0xCF - 0xA1;
 		writeVar(32811, 0); // clear bit 43
 		return;


Commit: 13167eccc6a16acaac6c560258a0283a67c50702
    https://github.com/scummvm/scummvm/commit/13167eccc6a16acaac6c560258a0283a67c50702
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-06-14T00:21:10+02:00

Commit Message:
NEWS: Mention workaround for Monkey Island 2 being marked as enhancement

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 7959cca5adb..a8c8182291f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -8,6 +8,12 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Kyra:
    - Added support for the Korean version of Legend of Kyrandia 1.
+   
+ SCUMM:
+   - Marked a workaround in Monkey Island 2 (FM-Towns version) as an
+     enhancement; this workaround originally restored a section a portion
+	 of the map chasing puzzle in Booty Island which had been cut in the
+	 FM-Towns version of the game.
 
  Toon:
    - Made game menus behave like in the original.