diff options
| author | aap <aap@papnet.eu> | 2019-07-04 09:15:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 09:15:30 +0200 |
| commit | fc011d76b46ea5881d7b9c5e701044df917a58d1 (patch) | |
| tree | 77949cc32155e844b34c75f856f79ff3f3ad9cec /src/General.h | |
| parent | Merge pull request #107 from Nick007J/master (diff) | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| download | re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.tar re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.tar.gz re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.tar.bz2 re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.tar.lz re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.tar.xz re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.tar.zst re3-fc011d76b46ea5881d7b9c5e701044df917a58d1.zip | |
Diffstat (limited to 'src/General.h')
| -rw-r--r-- | src/General.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/General.h b/src/General.h index fd78edaa..d315d50b 100644 --- a/src/General.h +++ b/src/General.h @@ -42,13 +42,14 @@ public: static float LimitRadianAngle(float angle) { - if (angle < -25.0f) - angle = -25.0f; - - if (angle > 25.0f) - angle = 25.0f; + float result; - float result = angle; + if (angle < -25.0f) + result = -25.0f; + else if (angle > 25.0f) + result = 25.0f; + else + result = angle; while (result >= PI) { result -= 2 * PI; @@ -71,7 +72,7 @@ public: if (x > 0.0f) { if (y > 0.0f) - return 2 * PI - atan2(x / y, 1.0f); + return PI - atan2(x / y, 1.0f); else return -atan2(x / y, 1.0f); } else { |