From e45aad9136400e124cff5f2f803fb145f85547d7 Mon Sep 17 00:00:00 2001
From: Peter Kohaut
Date: Sat, 19 Jan 2019 10:29:32 +0100
Subject: BLADERUNNER: Fixed rotation animation

Animated rotation wasnt checking for angle boundaries properly.
---
 engines/bladerunner/actor.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'engines/bladerunner/actor.cpp')

diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index 974cfdc45c..aa49d79664 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -608,12 +608,12 @@ bool Actor::tick(bool forceDraw, Common::Rect *screenRect) {
 				int facingChange = angleChange * (512.0f / M_PI);
 				if (facingChange != 0) {
 					_facing = _facing - facingChange;
-					if (_facing < 0) {
+					while (_facing < 0) {
 						_facing += 1024;
 					}
 
-					if (_facing >= 1024) {
-						_facing = _facing - 1024;
+					while (_facing >= 1024) {
+						_facing -= 1024;
 					}
 				}
 			}
@@ -760,7 +760,15 @@ void Actor::setFacing(int facing, bool halfOrSet) {
 		}
 	}
 
-	_facing = (_facing + offset) % 1024;
+	_facing += offset;
+
+	while (_facing < 0) {
+		_facing += 1024;
+	}
+
+	while (_facing >= 1024) {
+		_facing -= 1024;
+	}
 }
 
 void Actor::setBoundingBox(const Vector3 &position, bool retired) {
-- 
cgit v1.2.3