[Scummvm-git-logs] scummvm master -> 237fb44ec0de88d2e6b9a3faf8efe58575bf09a6
digitall
dgturner at iee.org
Thu Aug 9 22:27:59 CEST 2018
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:
237fb44ec0 STARTREK: Reorder Math Code to Simplify and Fix Compiler Warnings.
Commit: 237fb44ec0de88d2e6b9a3faf8efe58575bf09a6
https://github.com/scummvm/scummvm/commit/237fb44ec0de88d2e6b9a3faf8efe58575bf09a6
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T21:35:57+01:00
Commit Message:
STARTREK: Reorder Math Code to Simplify and Fix Compiler Warnings.
Changed paths:
engines/startrek/math.cpp
diff --git a/engines/startrek/math.cpp b/engines/startrek/math.cpp
index 70b9ddb..9f47309 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);
More information about the Scummvm-git-logs
mailing list