0009522: reset jetpack and choking states upon animation - and the other way around (#229)

* clear jetpack and choking upon anim and likewise, fixes 9522

* CClientPed::SetChoking: clear animation here as well

Author: patrikjuvonen

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -1919,10 +1919,16 @@ void CClientPed::SetFrozen(bool bFrozen)
         {
             if (m_pTaskManager)
             {
-                m_pTaskManager->RemoveTask(TASK_PRIORITY_PRIMARY);
+                // Let them have a jetpack (#9522)
+                if (!HasJetPack())
+                    m_pTaskManager->RemoveTask(TASK_PRIORITY_PRIMARY);
+
                 m_pTaskManager->RemoveTask(TASK_PRIORITY_EVENT_RESPONSE_TEMP);
                 m_pTaskManager->RemoveTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP);
-                m_pTaskManager->RemoveTask(TASK_PRIORITY_PHYSICAL_RESPONSE);
+
+                // Let's let them choke too
+                if (!IsChoking())
+                    m_pTaskManager->RemoveTask(TASK_PRIORITY_PHYSICAL_RESPONSE);
             }
 
             if (m_pPlayerPed)
@@ -4310,6 +4316,13 @@ void CClientPed::SetChoking(bool bChoking)
             // His not choking. Make him choke if that's what we're supposed to do.
             if (bChoking)
             {
+                // Remove jetpack now so it doesn't stay on (#9522#c25612)
+                if (HasJetPack())
+                    SetHasJetPack(false);
+
+                // Let's kill any animation
+                KillAnimation();
+
                 // Create the choking task
                 CTaskSimpleChoking* pTask = g_pGame->GetTasks()->CreateTaskSimpleChoking(NULL, true);
                 if (pTask)
@@ -4518,6 +4531,13 @@ bool CClientPed::SetHasJetPack(bool bHasJetPack)
                     m_pTaskManager->RemoveTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP);
                 }
 
+                // Kill choking state now so it doesn't stay on (#9522#c26644)
+                if (IsChoking())
+                    SetChoking(false);
+
+                // Kill animation as well
+                KillAnimation();
+
                 CTaskSimpleJetPack* pJetPackTask = g_pGame->GetTasks()->CreateTaskSimpleJetpack();
                 if (pJetPackTask)
                 {
@@ -5634,6 +5654,14 @@ void CClientPed::RunAnimation(AssocGroupId animGroup, AnimationId animID)
 
     if (m_pPlayerPed)
     {
+        // Remove jetpack now so it doesn't stay on (#9522#c25612)
+        if (HasJetPack())
+            SetHasJetPack(false);
+
+        // Let's not choke them any longer
+        if (IsChoking())
+            SetChoking(false);
+
         CTask* pTask = g_pGame->GetTasks()->CreateTaskSimpleRunAnim(animGroup, animID, 4.0f, TASK_SIMPLE_ANIM, "TASK_SIMPLE_ANIM");
         if (pTask)
         {
@@ -5660,6 +5688,14 @@ void CClientPed::RunNamedAnimation(CAnimBlock* pBlock, const char* szAnimName, i
 
         if (pBlock->IsLoaded())
         {
+            // Remove jetpack now so it doesn't stay on (#9522#c25612)
+            if (HasJetPack())
+                SetHasJetPack(false);
+
+            // Let's not choke them any longer
+            if (IsChoking())
+                SetChoking(false);
+
             /*
              Saml1er: Setting flags to 0x10 will tell GTA:SA that animation needs to be decompressed.
                       If not, animation will either crash or do some weird things.

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -3863,6 +3863,10 @@ bool CStaticFunctionDefinitions::GivePedJetPack(CElement* pElement)
         CPed* pPed = static_cast<CPed*>(pElement);
         if (pPed->IsSpawned() && !pPed->GetOccupiedVehicle() && !pPed->HasJetPack())
         {
+            // Remove choking state
+            if (pPed->IsChoking())
+                pPed->SetChoking(false);
+
             pPed->SetHasJetPack(true);
 
             CBitStream BitStream;
@@ -3992,6 +3996,10 @@ bool CStaticFunctionDefinitions::SetPedChoking(CElement* pElement, bool bChoking
                 // Not already (not) choking?
                 if (bChoking != pPed->IsChoking())
                 {
+                    // Remove jetpack now so it doesn't stay on (#9522#c25612)
+                    if (pPed->HasJetPack())
+                        pPed->SetHasJetPack(false);
+                    
                     pPed->SetChoking(bChoking);
 
                     CBitStream bitStream;
@@ -4203,6 +4211,14 @@ bool CStaticFunctionDefinitions::SetPedAnimation(CElement* pElement, const char*
         CPed* pPed = static_cast<CPed*>(pElement);
         if (pPed->IsSpawned())
         {
+            // Remove jetpack now so it doesn't stay on (#9522#c25612)
+            if (pPed->HasJetPack())
+                pPed->SetHasJetPack(false);
+
+            // Remove choking state
+            if (pPed->IsChoking())
+                pPed->SetChoking(false);
+
             // TODO: save their animation?
 
             // Tell the players