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

athrxx noreply at scummvm.org
Sat Oct 28 19:33:02 UTC 2023


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:
c0040a0ff6 SCUMM: minor fix to remapDirection


Commit: c0040a0ff6a7b55686f153c60e33d2e228826af6
    https://github.com/scummvm/scummvm/commit/c0040a0ff6a7b55686f153c60e33d2e228826af6
Author: athrxx (athrxx at scummvm.org)
Date: 2023-10-28T21:32:52+02:00

Commit Message:
SCUMM: minor fix to remapDirection

This is a follow to my previous commit.  We get rid of
the remaining LOOM FIXME. I have checked the different
SCUMM versions to see when the _ignoreBoxes check got
introduced.

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 9e1a5c45a4a..0976e199dde 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1378,12 +1378,7 @@ int Actor::remapDirection(int dir, bool is_walking) {
 	bool flipX;
 	bool flipY;
 
-	// FIXME: It seems that checking _ignoreBoxes here breaks some animations in Loom,
-	// causing Bobbin to face towards the camera instead of away from it
-	// in some places: After the tree has been destroyed by lightning, and
-	// when entering the dark tunnels beyond the dragon's lair at the very
-	// least. Possibly other places as well.
-	if ((!_ignoreBoxes && (_vm->_game.version < 7 || isInCurrentRoom())) || _vm->_game.id == GID_LOOM) {
+	if ((_vm->_game.version < 5 || !_ignoreBoxes) && (_vm->_game.version < 7 || isInCurrentRoom())) {
 		if (_walkbox != kOldInvalidBox) {
 			assert(_walkbox < ARRAYSIZE(_vm->_extraBoxFlags));
 			specdir = _vm->_extraBoxFlags[_walkbox];




More information about the Scummvm-git-logs mailing list