Modify gravity effects to not apply when player is in a jetpack

gta-chaos-mod · May 4, 2024 · af7dcdf · af7dcdf
1 parent 3511b99
commit af7dcdf
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/src/gtasa/effects/custom/gravity/GravityEffects.cpp b/src/gtasa/effects/custom/gravity/GravityEffects.cpp
@@ -18,8 +18,18 @@ class SimpleGravityEffect : public EffectBase
     {
         GameUtil::SetVehiclesToRealPhysics ();
 
+        CPlayerPed *player = FindPlayerPed ();
+        if (!player) return;
+
         for (CPed *ped : CPools::ms_pPedPool)
         {
+            if (ped == player)
+            {
+                // Don't apply gravity effects to the player if they are using a
+                // jetpack
+                if (player->m_pIntelligence->GetTaskJetPack ()) continue;
+            }
+
             NegateGravity (ped);
             ApplyGravity (ped);
         }

diff --git a/src/gtasa/effects/custom/gravity/InvertedGravityEffect.cpp b/src/gtasa/effects/custom/gravity/InvertedGravityEffect.cpp
@@ -30,8 +30,18 @@ class InvertedGravityEffect : public EffectBase
     {
         GameUtil::SetVehiclesToRealPhysics ();
 
+        CPlayerPed *player = FindPlayerPed ();
+        if (!player) return;
+
         for (CPed *ped : CPools::ms_pPedPool)
         {
+            if (ped == player)
+            {
+                // Don't apply gravity effects to the player if they are using a
+                // jetpack
+                if (player->m_pIntelligence->GetTaskJetPack ()) continue;
+            }
+
             NegateGravity (ped);
             ApplyGravity (ped, -0.002f);
         }

diff --git a/src/gtasa/effects/custom/gravity/ZeroGravityEffect.cpp b/src/gtasa/effects/custom/gravity/ZeroGravityEffect.cpp
@@ -11,8 +11,20 @@ class ZeroGravityEffect : public EffectBase
     {
         GameUtil::SetVehiclesToRealPhysics ();
 
+        CPlayerPed *player = FindPlayerPed ();
+        if (!player) return;
+
         for (CPed *ped : CPools::ms_pPedPool)
+        {
+            if (ped == player)
+            {
+                // Don't apply gravity effects to the player if they are using a
+                // jetpack
+                if (player->m_pIntelligence->GetTaskJetPack ()) continue;
+            }
+
             NegateGravity (ped);
+        }
 
         for (CVehicle *vehicle : CPools::ms_pVehiclePool)
             NegateGravity (vehicle);