Fix isPedOnGround

Client/game_sa/CPedSA.h

@@ -421,6 +421,7 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
     void           SetFightingStyle(eFightingStyle style, std::uint8_t styleExtra = 6) override;
 
     CEntity* GetContactEntity() const override;
+    bool     IsStandingOnEntity() const override { return GetPedInterface()->pContactEntity != nullptr; };
 
     int GetRunState() const override { return GetPedInterface()->moveState; }
 

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -4649,12 +4649,20 @@ float CClientPed::GetDistanceFromGround()
     return (vecPosition.fZ - fGroundLevel);
 }
 
-bool CClientPed::IsOnGround()
+bool CClientPed::IsOnGround(bool checkVehicles)
 {
     CVector vecPosition;
     GetPosition(vecPosition);
     float fGroundLevel = static_cast<float>(g_pGame->GetWorld()->FindGroundZFor3DPosition(&vecPosition));
-    return (vecPosition.fZ > fGroundLevel && (vecPosition.fZ - fGroundLevel) <= 1.0f);
+
+    if (definitelyLessThan(vecPosition.fZ, fGroundLevel))
+        return false;
+
+    bool isOnGround = definitelyLessThan((vecPosition.fZ - fGroundLevel), 1.0f) || essentiallyEqual((vecPosition.fZ - fGroundLevel), 1.0f);
+    if (!isOnGround && checkVehicles && m_pPlayerPed)
+        return m_pPlayerPed->IsStandingOnEntity();
+
+    return isOnGround;
 }
 
 bool CClientPed::IsClimbing()

Client/mods/deathmatch/logic/CClientPed.h

@@ -374,7 +374,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
 
     void SetInWater(bool bIsInWater) { m_bIsInWater = bIsInWater; };
     bool IsInWater();
-    bool IsOnGround();
+    bool IsOnGround(bool checkVehicles = false);
 
     bool          IsClimbing();
     bool          IsRadioOn() const noexcept { return m_bRadioOn; };

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp

@@ -914,13 +914,15 @@ int CLuaPedDefs::IsPedOnGround(lua_State* luaVM)
 {
     // Verify the argument
     CClientPed*      pPed = NULL;
+    bool             checkVehicles = false;
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pPed);
+    argStream.ReadBool(checkVehicles, false);
 
     if (!argStream.HasErrors())
     {
         // Find out whether he's on the ground or not and return it
-        bool bOnGround = pPed->IsOnGround();
+        bool bOnGround = pPed->IsOnGround(checkVehicles);
         lua_pushboolean(luaVM, bOnGround);
         return 1;
     }

Client/sdk/game/CPed.h

@@ -253,6 +253,7 @@ class CPed : public virtual CPhysical
     virtual void           SetFightingStyle(eFightingStyle style, std::uint8_t styleExtra) = 0;
 
     virtual CEntity* GetContactEntity() const = 0;
+    virtual bool     IsStandingOnEntity() const = 0;
 
     virtual int GetRunState() const = 0;
 

Shared/mods/deathmatch/logic/Utils.cpp

@@ -1107,3 +1107,23 @@ 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,3 +336,9 @@ 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);