[Scummvm-git-logs] scummvm master -> 89152dc2c44586ef16db4c9c5734a1c70626fc6b

[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:
89152dc2c4 SCUMM: fix regression from ef0d76a2


Commit: 89152dc2c44586ef16db4c9c5734a1c70626fc6b
    https://github.com/scummvm/scummvm/commit/89152dc2c44586ef16db4c9c5734a1c70626fc6b
Author: athrxx (athrxx at scummvm.org)
Date: 2021-06-28T16:31:27+02:00

Commit Message:
SCUMM: fix regression from ef0d76a2

(reported by erictorbjorn)
https://github.com/scummvm/scummvm/commit/ef0d76a2c7c3a061f4322fa29b879b4bdef606ad

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 3da2e34cb0..d71cf5b3ea 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -487,7 +487,7 @@ int Actor::calcMovementFactor(const Common::Point& next) {
 
 	// These two lines fix bug #1052 (INDY3: Hitler facing wrong directions in the Berlin scene).
 	// I can't see anything like this in the original SCUMM1/2 code, so I limit this to SCUMM3.
-	if (_vm->_game.version == 3 && (int)_speedx > ABS(diffX) && (int)_speedy > ABS(diffY))
+	if (_vm->_game.version == 3 && !(_moving & MF_LAST_LEG) && (int)_speedx > ABS(diffX) && (int)_speedy > ABS(diffY))
 		return 0;
 
 	if (diffY < 0)