Fix-up after 3940e18 (patches got mixed up)

Author: Dutchman101

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -231,17 +231,12 @@ void CClientPed::Init(CClientManager* pManager, unsigned long ulModelID, bool bI
     m_MovementStateNames[MOVEMENTSTATE_JOG] = "jog";
     m_MovementStateNames[MOVEMENTSTATE_SPRINT] = "sprint";
     m_MovementStateNames[MOVEMENTSTATE_CROUCH] = "crouch";
+    // These two are inactive for now
     m_MovementStateNames[MOVEMENTSTATE_CRAWL] = "crawl";
     m_MovementStateNames[MOVEMENTSTATE_ROLL] = "roll";
     m_MovementStateNames[MOVEMENTSTATE_JUMP] = "jump";
     m_MovementStateNames[MOVEMENTSTATE_FALL] = "fall";
     m_MovementStateNames[MOVEMENTSTATE_CLIMB] = "climb";
-    m_MovementStateNames[MOVEMENTSTATE_SWIM] = "swim";
-    m_MovementStateNames[MOVEMENTSTATE_WALK_TO_POINT] = "walk_to_point";
-    m_MovementStateNames[MOVEMENTSTATE_ASCENT_JETPACK] = "ascent_jetpack";
-    m_MovementStateNames[MOVEMENTSTATE_DESCENT_JETPACK] = "descent_jetpack";
-    m_MovementStateNames[MOVEMENTSTATE_JETPACK] = "jetpack_flying";
-    m_MovementStateNames[MOVEMENTSTATE_HANGING] = "hanging";
 
     // Create the player model
     if (m_bIsLocalPlayer)
@@ -1718,12 +1713,14 @@ void CClientPed::SetUsesCollision(bool bUsesCollision)
 
 float CClientPed::GetMaxHealth()
 {
+    // TODO: Verify this formula
+
     // Grab his player health stat
     float fStat = GetStat(MAX_HEALTH);
 
     // Do a linear interpolation to get how much health this would allow
-    // Assumes: 100 health = 569 stat, 176 health = 1000 stat.
-    float fMaxHealth = fStat * 0.176f;
+    // Assumes: 100 health = 569 stat, 200 health = 1000 stat.
+    float fMaxHealth = 100.0f + (100.0f / 431.0f * (fStat - 569.0f));
 
     // Return the max health. Make sure it can't be below 1
     if (fMaxHealth < 1.0f)
@@ -2425,69 +2422,53 @@ eMovementState CClientPed::GetMovementState()
         const char* szComplexTaskName = GetTaskManager()->GetActiveTask()->GetTaskName();
         const char* szSimpleTaskName = GetTaskManager()->GetSimplestActiveTask()->GetTaskName();
 
-        // Check tasks
-        if (strcmp(szSimpleTaskName, "TASK_SIMPLE_CLIMB") == 0) // Is he climbing?
-        {
-            CTaskSimpleClimb* climbingTask = dynamic_cast<CTaskSimpleClimb*>(GetTaskManager()->GetSimplestActiveTask());
-            if (climbingTask && climbingTask->GetHeightForPos() == eClimbHeights::CLIMB_GRAB)
-                return MOVEMENTSTATE_HANGING;
-
+        // Is he climbing?
+        if (strcmp(szSimpleTaskName, "TASK_SIMPLE_CLIMB") == 0)
             return MOVEMENTSTATE_CLIMB;
-        }
-        else if (strcmp(szComplexTaskName, "TASK_COMPLEX_JUMP") == 0) // Is he jumping?
+
+        // Is he jumping?
+        else if (strcmp(szComplexTaskName, "TASK_COMPLEX_JUMP") == 0)
             return MOVEMENTSTATE_JUMP;
-        else if (strcmp(szSimpleTaskName, "TASK_SIMPLE_GO_TO_POINT") == 0) // Entering vehicle (walking to the doors)?
-            return MOVEMENTSTATE_WALK_TO_POINT;
-        else if (strcmp(szSimpleTaskName, "TASK_SIMPLE_SWIM") == 0) // Is he swimming?
-            return MOVEMENTSTATE_SWIM;
-        else if (strcmp(szSimpleTaskName, "TASK_SIMPLE_JETPACK") == 0) // Is he flying?
-        {
-            if (cs.ButtonCross != 0)
-                return MOVEMENTSTATE_ASCENT_JETPACK;
-            else if (cs.ButtonSquare != 0)
-                return MOVEMENTSTATE_DESCENT_JETPACK;
-            else
-                return MOVEMENTSTATE_JETPACK;
-        }
 
-        // Check movement state
-        if (!IsOnGround() && !GetContactEntity() && !m_pPlayerPed->IsStandingOnEntity() && !m_pPlayerPed->IsInWater() && (strcmp(szSimpleTaskName, "TASK_SIMPLE_IN_AIR") == 0 || strcmp(szSimpleTaskName, "TASK_SIMPLE_FALL") == 0)) // Is he falling?
+        // Is he falling?
+        else if (!IsOnGround() && !GetContactEntity())
             return MOVEMENTSTATE_FALL;
 
-        // Sometimes it returns 'fall' or 'walk', so it's better to return false instead
-        if (IsEnteringVehicle() || IsLeavingVehicle())
-            return MOVEMENTSTATE_UNKNOWN;
+        // Grab his controller state
+        bool bWalkKey = false;
+        if (GetType() == CCLIENTPLAYER)
+            bWalkKey = CClientPad::GetControlState("walk", cs, true);
+        else
+            m_Pad.GetControlState("walk", bWalkKey);
 
+        // Is he standing up?
         if (!IsDucked())
         {
-            bool walking = false;
-            if (GetType() == CCLIENTPLAYER)
-                walking = CClientPad::GetControlState("walk", cs, true);
-            else
-                m_Pad.GetControlState("walk", walking);
+            unsigned int iRunState = m_pPlayerPed->GetRunState();
 
-            switch (m_pPlayerPed->GetMoveState())
-            {
-                case PedMoveState::PEDMOVE_STILL:
-                    return MOVEMENTSTATE_STAND;
-                case PedMoveState::PEDMOVE_WALK:
-                    return (cs.LeftStickX == 0 && cs.LeftStickY == 0) ? MOVEMENTSTATE_STAND : MOVEMENTSTATE_WALK;
-                case PedMoveState::PEDMOVE_SPRINT:
-                    return MOVEMENTSTATE_SPRINT;
-                case PedMoveState::PEDMOVE_RUN:
-                    return walking ? MOVEMENTSTATE_WALK : MOVEMENTSTATE_JOG; // FileEX: It should be MOVEMENTSTATE_RUN, but we're keeping JOG for backward compatibility (PEDMOVE_JOG is unused in SA)
-            }
+            // Is he moving the contoller at all?
+            if (iRunState == 1 && cs.LeftStickX == 0 && cs.LeftStickY == 0)
+                return MOVEMENTSTATE_STAND;
+
+            // Is he either pressing the walk key, or has run state 1?
+            if (iRunState == 1 || bWalkKey && iRunState == 6)
+                return MOVEMENTSTATE_WALK;
+            else if (iRunState == 4)
+                return MOVEMENTSTATE_POWERWALK;
+            else if (iRunState == 6)
+                return MOVEMENTSTATE_JOG;
+            else if (iRunState == 7)
+                return MOVEMENTSTATE_SPRINT;
         }
         else
         {
             // Is he moving the contoller at all?
             if (cs.LeftStickX == 0 && cs.LeftStickY == 0)
                 return MOVEMENTSTATE_CROUCH;
             else
-                return (cs.LeftStickX != 0 && cs.RightShoulder1 != 0) ? MOVEMENTSTATE_ROLL : MOVEMENTSTATE_CRAWL;
+                return MOVEMENTSTATE_CRAWL;
         }
     }
-
     return MOVEMENTSTATE_UNKNOWN;
 }
 
@@ -2914,11 +2895,6 @@ void CClientPed::StreamedInPulse(bool bDoStandardPulses)
             }
         }
 
-        // Are we need to update anim speed & progress?
-        // We need to do it here because the anim starts on the next frame after calling RunNamedAnimation
-        if (m_pAnimationBlock && m_AnimationCache.progressWaitForStreamIn && IsAnimationInProgress())
-            UpdateAnimationProgressAndSpeed();
-
         // Update our alpha
         unsigned char ucAlpha = m_ucAlpha;
         // Are we in a different interior to the camera? set our alpha to 0
@@ -3709,8 +3685,8 @@ void CClientPed::_CreateModel()
             Kill(WEAPONTYPE_UNARMED, 0, false, true);
         }
 
-        // Are we still playing a animation?
-        if (m_pAnimationBlock && IsAnimationInProgress())
+        // Are we still playing animation?
+        if ((m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame || m_AnimationCache.progressWaitForStreamIn) && m_pAnimationBlock)
         {
             if (m_bisCurrentAnimationCustom)
             {
@@ -3987,8 +3963,8 @@ void CClientPed::_ChangeModel()
             }
             m_bDontChangeRadio = false;
 
-            // Are we still playing a animation?
-            if (m_pAnimationBlock && IsAnimationInProgress())
+            // Are we still playing a looped animation?
+            if ((m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame || m_AnimationCache.progressWaitForStreamIn) && m_pAnimationBlock)
             {
                 if (m_bisCurrentAnimationCustom)
                 {
@@ -5760,23 +5736,7 @@ bool CClientPed::IsRunningAnimation()
         }
         return false;
     }
-    return (m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame) && m_pAnimationBlock;
-}
-
-bool CClientPed::IsAnimationInProgress()
-{
-    bool constAnim = m_AnimationCache.bLoop || m_AnimationCache.bFreezeLastFrame;
-
-    if (!m_pAnimationBlock)
-        return constAnim;
-
-    float elapsedTime = static_cast<float>(GetTimestamp() - m_AnimationCache.startTime) / 1000.0f;
-
-    auto animBlendHierarchy = g_pGame->GetAnimManager()->GetAnimation(m_AnimationCache.strName.c_str(), m_pAnimationBlock);
-    if (!animBlendHierarchy)
-        return constAnim;
-
-    return constAnim || elapsedTime < animBlendHierarchy->GetTotalTime();
+    return (m_AnimationCache.bLoop && m_pAnimationBlock);
 }
 
 void CClientPed::RunNamedAnimation(std::unique_ptr<CAnimBlock>& pBlock, const char* szAnimName, int iTime, int iBlend, bool bLoop, bool bUpdatePosition,
@@ -5864,6 +5824,10 @@ void CClientPed::RunNamedAnimation(std::unique_ptr<CAnimBlock>& pBlock, const ch
     m_AnimationCache.bUpdatePosition = bUpdatePosition;
     m_AnimationCache.bInterruptable = bInterruptable;
     m_AnimationCache.bFreezeLastFrame = bFreezeLastFrame;
+    m_AnimationCache.progress = 0.0f;
+    m_AnimationCache.speed = 1.0f;
+    m_AnimationCache.progressWaitForStreamIn = false;
+    m_AnimationCache.elapsedTime = 0.0f;
 }
 
 void CClientPed::KillAnimation()
@@ -5902,45 +5866,39 @@ void CClientPed::RunAnimationFromCache()
     if (!m_pAnimationBlock)
         return;
 
+    bool  needCalcProgress = m_AnimationCache.progressWaitForStreamIn;
+    float elapsedTime = m_AnimationCache.elapsedTime;
+
     // Copy our name incase it gets deleted
     std::string animName = m_AnimationCache.strName;
 
     // Run our animation
     RunNamedAnimation(m_pAnimationBlock, animName.c_str(), m_AnimationCache.iTime, m_AnimationCache.iBlend, m_AnimationCache.bLoop, m_AnimationCache.bUpdatePosition, m_AnimationCache.bInterruptable, m_AnimationCache.bFreezeLastFrame);
 
-    // Set anim progress & speed
-    m_AnimationCache.progressWaitForStreamIn = true;
-}
-
-void CClientPed::UpdateAnimationProgressAndSpeed()
-{
-    if (!m_AnimationCache.progressWaitForStreamIn)
-        return;
-
-    // Get current anim
-    auto animAssoc = g_pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(GetClump(), m_AnimationCache.strName.c_str());
+    auto animAssoc = g_pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(GetClump(), animName.c_str());
     if (!animAssoc)
         return;
 
-    float animLength = animAssoc->GetLength();
-    float progress = 0.0f;
-    float elapsedTime = static_cast<float>(GetTimestamp() - m_AnimationCache.startTime) / 1000.0f;
-
-    if (m_AnimationCache.bFreezeLastFrame) // time and loop is ignored if freezeLastFrame is true
-        progress = (elapsedTime / animLength) * m_AnimationCache.speed;
-    else
+    // If the anim is synced from the server side, we need to calculate the progress
+    float progress = m_AnimationCache.progress;
+    if (needCalcProgress)
     {
-        if (m_AnimationCache.bLoop)
-            progress = std::fmod(elapsedTime * m_AnimationCache.speed, animLength) / animLength;
+        float animLength = animAssoc->GetLength();
+
+        if (m_AnimationCache.bFreezeLastFrame) // time and loop is ignored if freezeLastFrame is true
+            progress = (elapsedTime / animLength) * m_AnimationCache.speed;
         else
-            // For non-looped animations, limit duration to animLength if time exceeds it
-            progress = (elapsedTime / (m_AnimationCache.iTime <= animLength ? m_AnimationCache.iTime : animLength)) * m_AnimationCache.speed;
+        {
+            if (m_AnimationCache.bLoop)
+                progress = std::fmod(elapsedTime * m_AnimationCache.speed, animLength) / animLength;
+            else
+                // For non-looped animations, limit duration to animLength if time exceeds it
+                progress = (elapsedTime / (m_AnimationCache.iTime <= animLength ? m_AnimationCache.iTime : animLength)) * m_AnimationCache.speed;
+        }
     }
 
     animAssoc->SetCurrentProgress(std::clamp(progress, 0.0f, 1.0f));
     animAssoc->SetCurrentSpeed(m_AnimationCache.speed);
-
-    m_AnimationCache.progressWaitForStreamIn = false;
 }
 
 void CClientPed::PostWeaponFire()
@@ -6145,7 +6103,7 @@ bool CClientPed::ShouldBeStealthAiming()
                 {
                     // We need to be either crouched, walking or standing
                     SBindableGTAControl* pWalkControl = pKeyBinds->GetBindableFromControl("walk");
-                    if (m_pPlayerPed->GetMoveState() == PedMoveState::PEDMOVE_STILL || m_pPlayerPed->GetMoveState() == PedMoveState::PEDMOVE_WALK || pWalkControl && pWalkControl->bState)
+                    if (m_pPlayerPed->GetRunState() == 1 || m_pPlayerPed->GetRunState() == 4 || pWalkControl && pWalkControl->bState)
                     {
                         // Do we have a target ped?
                         CClientPed* pTargetPed = GetTargetedPed();
@@ -6524,6 +6482,12 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
         return false;
     }
 
+    // Check the server is compatible if we are a ped
+    if (!IsLocalPlayer() && !g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+    {
+        return false;
+    }
+
     // Are we already inside a vehicle
     if (GetOccupiedVehicle())
     {
@@ -6692,7 +6656,11 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
         return false;
     }
 
-    pBitStream->Write(GetID());
+    // Write the ped ID to it if server supports it
+    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+    {
+        pBitStream->Write(GetID());
+    }
 
     // Write the vehicle id to it and that we're requesting to get into it
     pBitStream->Write(pVehicle->GetID());
@@ -6755,6 +6723,12 @@ bool CClientPed::ExitVehicle()
         return false;
     }
 
+    // Check the server is compatible if we are a ped
+    if (!IsLocalPlayer() && !g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+    {
+        return false;
+    }
+
     // Are we already sending an in/out request or not allowed to create a new in/out?
     if (m_bNoNewVehicleTask                                  // Are we permitted to even enter a vehicle?
         || m_VehicleInOutID != INVALID_ELEMENT_ID            // Make sure we're not already processing a vehicle enter (would refer to valid ID if we were)
@@ -6815,7 +6789,11 @@ bool CClientPed::ExitVehicle()
         return false;
     }
 
-    pBitStream->Write(GetID());
+    // Write the ped ID to it if server supports it
+    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+    {
+        pBitStream->Write(GetID());
+    }
 
     // Write the vehicle id to it and that we're requesting to get out of it
     pBitStream->Write(pOccupiedVehicle->GetID());
@@ -6943,7 +6921,10 @@ void CClientPed::UpdateVehicleInOut()
             if (pBitStream)
             {
                 // Write the ped ID to it
-                pBitStream->Write(GetID());
+                if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+                {
+                    pBitStream->Write(GetID());
+                }
 
                 // Write the car id and the action id (enter complete)
                 pBitStream->Write(m_VehicleInOutID);
@@ -6993,7 +6974,10 @@ void CClientPed::UpdateVehicleInOut()
                 if (pBitStream)
                 {
                     // Write the ped or player ID to it
-                    pBitStream->Write(GetID());
+                    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+                    {
+                        pBitStream->Write(GetID());
+                    }
 
                     // Write the car id and the action id (enter complete)
                     pBitStream->Write(m_VehicleInOutID);
@@ -7037,7 +7021,10 @@ void CClientPed::UpdateVehicleInOut()
                 if (pBitStream)
                 {
                     // Write the ped or player ID to it
-                    pBitStream->Write(GetID());
+                    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+                    {
+                        pBitStream->Write(GetID());
+                    }
 
                     // Write the car id and the action id (enter complete)
                     pBitStream->Write(m_VehicleInOutID);
@@ -7149,7 +7136,10 @@ void CClientPed::UpdateVehicleInOut()
             return;
 
         // Write the ped or player ID to it
-        pBitStream->Write(GetID());
+        if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
+        {
+            pBitStream->Write(GetID());
+        }
 
         // Vehicle id
         pBitStream->Write(pOccupiedVehicle->GetID());