Review

Author: FileEX

Client/game_sa/CPedSA.cpp

@@ -876,17 +876,17 @@ bool CPedSA::SetOnFire(bool onFire)
     }
     else
     {
+        bool wasFire = false;
+
         CFire* fire = fireManager->GetFire(static_cast<CFireSAInterface*>(pInterface->pFireOnPed));
         if (fire)
+        {
             fire->Extinguish();
+            wasFire = true;
+        }
 
         CTaskManager* taskManager = m_pPedIntelligence->GetTaskManager();
-        if (taskManager)
-        {
-            CTask* task = taskManager->GetTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM);
-            if (task && task->GetTaskType() == TASK_SIMPLE_PLAYER_ON_FIRE)
-                taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM);
-        }            
+        return wasFire || (taskManager && taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM, TASK_SIMPLE_PLAYER_ON_FIRE));
     }
 
     return true;

Client/game_sa/CTaskManagerSA.cpp

@@ -151,6 +151,18 @@ void CTaskManagerSA::RemoveTaskSecondary(const int iTaskPriority)
     SetTaskSecondary(NULL, iTaskPriority);
 }
 
+bool CTaskManagerSA::RemoveTaskSecondary(const int taskPriority, const int taskType)
+{
+    CTask* task = GetTaskSecondary(taskPriority);
+    if (task && task->GetTaskType() == taskType)
+    {
+        RemoveTaskSecondary(taskPriority);
+        return true;
+    }
+
+    return false;
+}
+
 void CTaskManagerSA::SetTaskSecondary(CTaskSA* pTaskSecondary, const int iType)
 {
     DWORD             dwFunc = FUNC_SetTaskSecondary;

Client/game_sa/CTaskManagerSA.h

@@ -57,6 +57,7 @@ class CTaskManagerSA : public CTaskManager
     CTask* FindActiveTaskByType(const int iTaskType);
     CTask* FindTaskByType(const int iPriority, const int iTaskType);
     void   RemoveTaskSecondary(const int iTaskPriority);
+    bool   RemoveTaskSecondary(const int taskPriority, const int taskType);
     void   SetTaskSecondary(CTaskSA* pTaskSecondary, const int iType);
     CTask* GetTaskSecondary(const int iType);                        // code it
     bool   HasTaskSecondary(const CTask* pTaskSecondary);            // code it

Client/sdk/game/CTaskManager.h

@@ -60,6 +60,7 @@ class CTaskManager
     virtual CTask* FindActiveTaskByType(const int iTaskType) = 0;
     virtual CTask* FindTaskByType(const int iPriority, const int iTaskType) = 0;
     virtual void   RemoveTaskSecondary(const int iTaskPriority) = 0;
+    virtual bool   RemoveTaskSecondary(const int taskPriority, const int taskType) = 0;
     // virtual void SetTaskSecondary(CTask* pTaskSecondary, const int iType)=0;
     virtual CTask* GetTaskSecondary(const int iType) = 0;
     virtual bool   HasTaskSecondary(const CTask* pTaskSecondary) = 0;