[Scummvm-git-logs] scummvm master -> 8c71eded545b5fcd33c320ca5f0f7e44bbbd8036

[bluegr]

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:
53382fb52b SCUMM: Optionally enable the swamp bats in Mac MI2
8c71eded54 SCUMM: Optionally report a faster machine speed in Mac MI2


Commit: 53382fb52bb3caf9761707e1cfbe2bcd61a27b34
    https://github.com/scummvm/scummvm/commit/53382fb52bb3caf9761707e1cfbe2bcd61a27b34
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-12-03T19:52:46+02:00

Commit Message:
SCUMM: Optionally enable the swamp bats in Mac MI2

The call to their script has been removed from room 20's entry script,
so it's a simple matter of re-inserting that.

Changed paths:
    engines/scumm/script.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 252070b228b..37f37c168ce 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1041,6 +1041,16 @@ void ScummEngine::runEntryScript() {
 	}
 	if (VAR_ENTRY_SCRIPT2 != 0xFF && VAR(VAR_ENTRY_SCRIPT2))
 		runScript(VAR(VAR_ENTRY_SCRIPT2), 0, 0, nullptr);
+
+	// WORKAROUND: The Macintosh version of MI2 doesn't have any bats in the
+	// Scabb Island swamp, because that line has been removed from the entry
+	// script for room 20. We re-insert that call here.
+	if (_game.id == GID_MONKEY2 && _game.platform == Common::kPlatformMacintosh &&
+		_currentRoom == 20 && enhancementEnabled(kEnhRestoredContent)) {
+		int args[NUM_SCRIPT_LOCAL];
+		memset(args, 0, sizeof(args));
+		runScript(215, false, false, args);
+	}
 }
 
 void ScummEngine::runQuitScript() {


Commit: 8c71eded545b5fcd33c320ca5f0f7e44bbbd8036
    https://github.com/scummvm/scummvm/commit/8c71eded545b5fcd33c320ca5f0f7e44bbbd8036
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-12-03T19:52:46+02:00

Commit Message:
SCUMM: Optionally report a faster machine speed in Mac MI2

This affects the number of bats in the Scabb Island swamp, and quite
possibly other things as well. So it seems like a good candidate for a
"restored content" enhancement.

Changed paths:
    engines/scumm/script.cpp


diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 37f37c168ce..52dce02dda0 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -593,6 +593,13 @@ int ScummEngine::readVar(uint var) {
 			return !ConfMan.getBool("subtitles");
 		}
 
+		// WORKAROUND: The Macintosh version version of MI2 first sets the
+		// machine speed to 2, then immediately to 1, in script 1. This affects
+		// at the very least the number of bats in the Scabb Island swamp.
+		if (_game.id == GID_MONKEY2 && _game.platform == Common::kPlatformMacintosh && var == VAR_MACHINE_SPEED && enhancementEnabled(kEnhRestoredContent)) {
+			return 2;
+		}
+
 #if defined(USE_ENET) && defined(USE_LIBCURL)
 		if (_enableHECompetitiveOnlineMods) {
 			// HACK: If we're reading var586, competitive mods enabled, playing online,