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

[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:
caacc8f3c8 SCUMM: Optionally restore boat wreck graphics at beginning of Mac MI2


Commit: caacc8f3c88bf4db8f6d03682bad2e09d352a2b3
    https://github.com/scummvm/scummvm/commit/caacc8f3c88bf4db8f6d03682bad2e09d352a2b3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-12-02T23:25:18+02:00

Commit Message:
SCUMM: Optionally restore boat wreck graphics at beginning of Mac MI2

It's possible that it was cut for performance reasons (it's also removed
from the Amiga version), since there's some simple parallax scrolling
going on here. But that's not a concern for ScummVM, of course.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index e0e094d5ba9..18a40cd948f 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -2047,6 +2047,29 @@ void ScummEngine_v5::o5_putActorInRoom() {
 	if (a->_visible && _currentRoom != room && getTalkingActor() == a->_number) {
 		stopTalk();
 	}
+
+	// WORKAROUND: The boat wreck in the foreground at the entrance to Woodtick
+	// isn't present in the Macintosh version. The instruction to place the
+	// actor is still there, but places it in room 0. The actor is not
+	// initialized, and the scroll script is never set. (It is however still
+	// cleared when you leave the room, so we don't need to worry about that
+	// part of it.)
+	//
+	// This may have been done for performance reasons, though would the Mac II
+	// really have been that under-powered?
+
+	if (_game.id == GID_MONKEY2 && _game.platform == Common::kPlatformMacintosh &&
+		_currentRoom == 7 && vm.slot[_currentScript].number == 10002 &&
+		a->_number == 11 && room == 0 && enhancementEnabled(kEnhRestoredContent)) {
+		room = _currentRoom;
+		a->animateActor(250);
+		a->initActor(0);
+		a->setActorCostume(142);
+		a->_ignoreBoxes = 1;
+		a->_forceClip = 0;
+		VAR(VAR_SCROLL_SCRIPT) = 207;
+	}
+
 	a->_room = room;
 	if (!room)
 		a->putActor(0, 0, 0);