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

[OMGPizzaGuy]

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:
d04e87e07a ULTIMA8: Fix check turn for northwest to north


Commit: d04e87e07a09a34d3bd34463cbf80fbb781288be
    https://github.com/scummvm/scummvm/commit/d04e87e07a09a34d3bd34463cbf80fbb781288be
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2020-08-23T16:10:33-05:00

Commit Message:
ULTIMA8: Fix check turn for northwest to north

Changed paths:
    engines/ultima/ultima8/world/actors/avatar_mover_process.cpp


diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
index a05ec2a842..835f955bad 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
@@ -866,14 +866,13 @@ bool AvatarMoverProcess::checkTurn(Direction direction, bool moving) {
 
 	// Note: don't need to turn if moving backward in combat stance
 	// CHECKME: currently, first turn in the right direction
-	if (direction != curdir && !(
-	            combat && ABS(direction - curdir) == 8)) {
+	if (direction != curdir && !(combat && Direction_Invert(direction) == curdir)) {
 		Animation::Sequence lastanim = avatar->getLastAnim();
 
 		if (moving &&
 		        (lastanim == Animation::walk || lastanim == Animation::run ||
 		         lastanim == Animation::combatStand) &&
-		        (ABS(direction - curdir) + 2 % 16 <= 4)) {
+		        (ABS(direction - curdir) + 2) % 16 <= 4) {
 			// don't need to explicitly do a turn animation
 			return false;
 		}