[Scummvm-git-logs] scummvm master -> 7396e21c479d60cf038f0124876496aa02c574b5

[athrxx]

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:
7396e21c47 SCUMM: (v7/8)- fix walk code bug


Commit: 7396e21c479d60cf038f0124876496aa02c574b5
    https://github.com/scummvm/scummvm/commit/7396e21c479d60cf038f0124876496aa02c574b5
Author: athrxx (athrxx at scummvm.org)
Date: 2023-11-25T01:10:25+01:00

Commit Message:
SCUMM: (v7/8)- fix walk code bug

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 5ed68b9b723..e52169f50ba 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1616,11 +1616,13 @@ void Actor_v7::turnToDirection(int newdir) {
 	newdir = remapDirection((newdir + 360) % 360, false);
 	_moving &= ~MF_TURN;
 
-	byte flags = _vm->getBoxFlags(_walkbox);
-	if ((flags & kBoxXFlip) || isInClass(kObjectClassXFlip))
-		newdir = 360 - newdir;
-	if ((flags & kBoxYFlip) || isInClass(kObjectClassYFlip))
-		newdir = 180 - newdir;
+	if (isInCurrentRoom() && !_ignoreBoxes) { 
+		byte flags = _vm->getBoxFlags(_walkbox);
+		if ((flags & kBoxXFlip) || isInClass(kObjectClassXFlip))
+			newdir = 360 - newdir;
+		if ((flags & kBoxYFlip) || isInClass(kObjectClassYFlip))
+			newdir = 180 - newdir;
+	}
 
 	if (newdir != _facing) {
 		_moving |= MF_TURN;