Fix bug

Author: FileEX

Client/game_sa/CFireSA.cpp

@@ -14,6 +14,8 @@
 #include "CFireSA.h"
 #include "CGameSA.h"
 #include "CPoolsSA.h"
+#include <game/CTaskManager.h>
+#include <game/TaskTypes.h>
 
 extern CGameSA* pGame;
 
@@ -209,3 +211,46 @@ void CFireSA::SetNumGenerationsAllowed(char generations)
 {
     internalInterface->nNumGenerationsAllowed = generations;
 }
+
+////////////////////////////////////////////////////////////////////////
+// CFire::Extinguish
+//
+// Fix GH #3249 (PLAYER_ON_FIRE task is not aborted after the fire is extinguished)
+////////////////////////////////////////////////////////////////////////
+static void AbortFireTask(CEntitySAInterface* entityOnFire)
+{
+    if (!entityOnFire)
+        return;
+
+    auto ped = pGame->GetPools()->GetPed(reinterpret_cast<DWORD*>(entityOnFire));
+    if (!ped || !ped->pEntity)
+        return;
+
+    CTaskManager* taskManager = ped->pEntity->GetPedIntelligence()->GetTaskManager();
+    if (!taskManager)
+        return;
+
+    taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM, TASK_SIMPLE_PLAYER_ON_FIRE);
+}
+
+#define HOOKPOS_CFire_Extinguish 0x539429
+#define HOOKSIZE_CFire_Extinguish 6
+static constexpr std::uintptr_t CONTINUE_CFire_Extinguish = 0x53942F;
+static void _declspec(naked) HOOK_CFire_Extinguish()
+{
+    _asm
+    {
+        mov [eax+730h], edi
+
+        push eax
+        call AbortFireTask
+        add esp, 4
+
+        jmp CONTINUE_CFire_Extinguish
+    }
+}
+
+void CFireSA::StaticSetHooks()
+{
+    EZHookInstall(CFire_Extinguish);
+}

Client/game_sa/CFireSA.h

@@ -64,4 +64,6 @@ class CFireSA : public CFire
     void              SetStrength(float fStrength);
     void              SetNumGenerationsAllowed(char generations);
     CFireSAInterface* GetInterface() { return internalInterface; }
+
+    static void StaticSetHooks();
 };

Client/game_sa/CGameSA.cpp

@@ -245,6 +245,7 @@ CGameSA::CGameSA()
         CVehicleSA::StaticSetHooks();
         CCheckpointSA::StaticSetHooks();
         CHudSA::StaticSetHooks();
+        CFireSA::StaticSetHooks();
     }
     catch (const std::bad_alloc& e)
     {

Client/game_sa/CPedSA.cpp

@@ -854,7 +854,7 @@ void CPedSA::SetBleeding(bool bBleeding)
 bool CPedSA::SetOnFire(bool onFire)
 {
     CPedSAInterface* pInterface = GetPedInterface();
-    if (onFire && pInterface->pFireOnPed)
+    if (onFire == !!pInterface->pFireOnPed)
         return false;
 
     auto* fireManager = static_cast<CFireManagerSA*>(pGame->GetFireManager());
@@ -876,17 +876,11 @@ bool CPedSA::SetOnFire(bool onFire)
     }
     else
     {
-        bool wasFire = false;
-
         CFire* fire = fireManager->GetFire(static_cast<CFireSAInterface*>(pInterface->pFireOnPed));
-        if (fire)
-        {
-            fire->Extinguish();
-            wasFire = true;
-        }
+        if (!fire)
+            return false;
 
-        CTaskManager* taskManager = m_pPedIntelligence->GetTaskManager();
-        return wasFire || (taskManager && taskManager->RemoveTaskSecondary(TASK_SECONDARY_PARTIAL_ANIM, TASK_SIMPLE_PLAYER_ON_FIRE));
+        fire->Extinguish();
     }
 
     return true;