diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-09-16 19:32:58 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-09-17 22:22:34 +0200 |
| commit | 0f9178568b3470d35ffc1d5e21a230d8cc11eef1 (patch) | |
| tree | e6b421513dfac9908ae727290ab7ec947842cdf3 /src/core | |
| parent | Merge pull request #208 from Nick007J/master (diff) | |
| download | re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.gz re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.bz2 re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.lz re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.xz re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.tar.zst re3-0f9178568b3470d35ffc1d5e21a230d8cc11eef1.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/General.h | 9 | ||||
| -rw-r--r-- | src/core/World.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/core/General.h b/src/core/General.h index 366c571c..d73cf36f 100644 --- a/src/core/General.h +++ b/src/core/General.h @@ -54,14 +54,7 @@ public: static float LimitRadianAngle(float angle) { - float result; - - if (angle < -25.0f) - result = -25.0f; - else if (angle > 25.0f) - result = 25.0f; - else - result = angle; + float result = clamp(angle, -25.0f, 25.0f); while (result >= PI) { result -= 2 * PI; diff --git a/src/core/World.h b/src/core/World.h index b24e66f0..523585e7 100644 --- a/src/core/World.h +++ b/src/core/World.h @@ -56,9 +56,10 @@ class CWorld static CPtrList &ms_listMovingEntityPtrs; static CSector (*ms_aSectors)[NUMSECTORS_X]; // [NUMSECTORS_Y][NUMSECTORS_X]; static uint16 &ms_nCurrentScanCode; - static CColPoint &ms_testSpherePoint; public: + static CColPoint& ms_testSpherePoint; + static uint8 &PlayerInFocus; static CPlayerInfo *Players; static CEntity *&pIgnoreEntity; |