[Scummvm-git-logs] scummvm master -> 6a3818d78c6b141c2ccce613b1870e393a62ec1c

[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:
6a3818d78c ULTIMA8: Fix combat retreat from old direction comparison changes


Commit: 6a3818d78c6b141c2ccce613b1870e393a62ec1c
    https://github.com/scummvm/scummvm/commit/6a3818d78c6b141c2ccce613b1870e393a62ec1c
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2020-08-05T22:34:41-05:00

Commit Message:
ULTIMA8: Fix combat retreat from old direction comparison changes

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 a46825eac1..0c23356543 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.cpp
@@ -263,7 +263,7 @@ void AvatarMoverProcess::handleCombatMode() {
 			// want to run while in combat mode?
 			// first sheath weapon
 			nextanim = Animation::readyWeapon;
-		} else if (ABS(direction - mousedir) == 4) {
+		} else if (Direction_Invert(direction) == mousedir) {
 			nextanim = Animation::retreat;
 			nextdir = direction;
 		} else {
@@ -356,7 +356,7 @@ void AvatarMoverProcess::handleCombatMode() {
 			// want to run while in combat mode?
 			// first sheath weapon
 			nextanim = Animation::readyWeapon;
-		} else if (ABS(direction - nextdir) == 4) {
+		} else if (Direction_Invert(direction) == nextdir) {
 			nextanim = Animation::retreat;
 			nextdir = direction;
 		} else {