From 237fb44ec0de88d2e6b9a3faf8efe58575bf09a6 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Thu, 9 Aug 2018 21:35:57 +0100
Subject: STARTREK: Reorder Math Code to Simplify and Fix Compiler Warnings.

---
 engines/startrek/math.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'engines')

diff --git a/engines/startrek/math.cpp b/engines/startrek/math.cpp
index 70b9ddb081..9f47309a1f 100644
--- a/engines/startrek/math.cpp
+++ b/engines/startrek/math.cpp
@@ -37,7 +37,7 @@ Fixed14 StarTrekEngine::sin(Angle angle) {
 	else if (i == 0x300)
 		return -1.0;
 
-	float f;
+	float f = 0.0;
 	if (i < 0x100)
 		f = _sineTable.getTable()[i & 0xff];
 	else if (i < 0x200)
@@ -104,23 +104,23 @@ Angle StarTrekEngine::atan2(int32 deltaX, int32 deltaY) {
 	}
 
 	if (deltaY > deltaX) {
-		if (!deltaYNegative && !deltaXNegative)
-			angle = angle;
-		else if (!deltaYNegative && deltaXNegative)
-			angle = -angle;
+		if (deltaYNegative && deltaXNegative)
+			angle = angle - 512;
 		else if (deltaYNegative && !deltaXNegative)
 			angle = 512 - angle;
-		else
-			angle = angle - 512;
+		else if (!deltaYNegative && deltaXNegative)
+			angle = -angle;
+		// else if (!deltaYNegative && !deltaXNegative)
+		//	angle remains the same i.e. angle = angle
 	} else {
-		if (!deltaYNegative && !deltaXNegative)
-			angle = 256 - angle;
+		if (deltaYNegative && deltaXNegative)
+			angle = -256 - angle;
 		else if (deltaYNegative && !deltaXNegative)
 			angle = 256 + angle;
-		else if (deltaYNegative && deltaXNegative)
-			angle = -256 - angle;
-		else
+		else if (!deltaYNegative && deltaXNegative)
 			angle = -256 + angle;
+		else // if (!deltaYNegative && !deltaXNegative)
+			angle = 256 - angle;
 	}
 
 	return Angle::fromRaw(angle);
-- 
cgit v1.2.3