Review

Author: FileEX

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -4672,10 +4672,10 @@ bool CClientPed::IsOnGround(bool checkVehicles)
     GetPosition(vecPosition);
     float fGroundLevel = static_cast<float>(g_pGame->GetWorld()->FindGroundZFor3DPosition(&vecPosition));
 
-    if (definitelyLessThan(vecPosition.fZ, fGroundLevel))
+    if (DefinitelyLessThan(vecPosition.fZ, fGroundLevel))
         return false;
 
-    bool isOnGround = definitelyLessThan((vecPosition.fZ - fGroundLevel), 1.0f) || essentiallyEqual((vecPosition.fZ - fGroundLevel), 1.0f);
+    bool isOnGround = DefinitelyLessThan((vecPosition.fZ - fGroundLevel), 1.0f) || EssentiallyEqual((vecPosition.fZ - fGroundLevel), 1.0f);
     if (!isOnGround && checkVehicles && m_pPlayerPed)
         return m_pPlayerPed->IsStandingOnEntity();
 

Shared/mods/deathmatch/logic/Utils.cpp

@@ -1102,23 +1102,3 @@ CVector ConvertEulerRotationOrder(const CVector& a_vRotation, eEulerRotationOrde
         return a_vRotation;
     }
 }
-
-bool approximatelyEqual(float a, float b, float epsilon)
-{
-    return std::fabs(a - b) <= std::max(std::fabs(a), std::fabs(b)) * epsilon;
-}
-
-bool essentiallyEqual(float a, float b, float epsilon)
-{
-    return std::fabs(a - b) <= std::min(std::fabs(a), std::fabs(b)) * epsilon;
-}
-
-bool definitelyGreaterThan(float a, float b, float epsilon)
-{
-    return (a - b) > std::max(std::fabs(a), std::fabs(b)) * epsilon;
-}
-
-bool definitelyLessThan(float a, float b, float epsilon)
-{
-    return (b - a) > std::max(std::fabs(a), std::fabs(b)) * epsilon;
-}

Shared/mods/deathmatch/logic/Utils.h

@@ -336,9 +336,3 @@ void DeletePointersAndClearList(T& elementList)
         delete *iter;
     }
 }
-
-// Comparing floating point numbers
-bool approximatelyEqual(float a, float b, float epsilon = FLOAT_EPSILON);
-bool essentiallyEqual(float a, float b, float epsilon = FLOAT_EPSILON);
-bool definitelyGreaterThan(float a, float b, float epsilon = FLOAT_EPSILON);
-bool definitelyLessThan(float a, float b, float epsilon = FLOAT_EPSILON);

Shared/sdk/SharedUtil.Math.h

@@ -118,4 +118,25 @@ namespace SharedUtil
     {
 	    return std::fabs(a - b) <= epsilon;
     }
+
+    inline bool ApproximatelyEqual(float a, float b, float epsilon = std::numeric_limits<float>().epsilon()) noexcept
+    {
+        return std::fabs(a - b) <= std::max(std::fabs(a), std::fabs(b)) * epsilon;
+    }
+
+    inline bool EssentiallyEqual(float a, float b, float epsilon = std::numeric_limits<float>().epsilon()) noexcept
+    {
+        return std::fabs(a - b) <= std::min(std::fabs(a), std::fabs(b)) * epsilon;
+    }
+
+    inline bool DefinitelyGreaterThan(float a, float b, float epsilon = std::numeric_limits<float>().epsilon()) noexcept
+    {
+        return (a - b) > std::max(std::fabs(a), std::fabs(b)) * epsilon;
+    }
+
+    inline bool DefinitelyLessThan(float a, float b, float epsilon = std::numeric_limits<float>().epsilon()) noexcept
+    {
+        return (b - a) > std::max(std::fabs(a), std::fabs(b)) * epsilon;
+    }
+
 }            // namespace SharedUtil