Merge branch 'master' into bugfix/fire_task

FileEX · web-flow · commit dfded0907489 · 2025-05-07T23:49:50.000+02:00
diff --git a/Client/game_sa/CWeatherSA.cpp b/Client/game_sa/CWeatherSA.cpp
@@ -12,6 +12,8 @@
 #include "StdInc.h"
 #include "CWeatherSA.h"
 
+static float WEATHER_FAKE_ACCUMULATOR;
+
 unsigned char CWeatherSA::Get()
 {
     return *(unsigned char*)0xC81318; // CWeather::ForcedWeatherType
@@ -36,15 +38,8 @@ float CWeatherSA::GetAmountOfRain()
 void CWeatherSA::SetAmountOfRain(float fAmount)
 {
     // Patch all the places inside of CWeather::Update that would overwrite CWeather::Rain
-    MemPut<BYTE>(0x72C686, 0xDD);
-    MemPut<BYTE>(0x72C687, 0xD8);
-
-    MemSet((void*)0x72C688, 0x90, 4);
-
-    MemPut<BYTE>(0x72BC92, 0xDD);
-    MemPut<BYTE>(0x72BC93, 0xD8);
-
-    MemSet((void*)0x72BC94, 0x90, 4);
+    MemPut<DWORD>((LPVOID)(0x72C686 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BC92 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemSet((void*)0x72BC72, 0x90, 5);
 
@@ -55,12 +50,11 @@ void CWeatherSA::SetAmountOfRain(float fAmount)
 void CWeatherSA::ResetAmountOfRain()
 {
     BYTE originalMov[5] = {0xA3, 0x24, 0x13, 0xC8, 0x00};                    // 0x72BC72
-    BYTE originalFstp1[6] = {0xD9, 0x1D, 0x24, 0x13, 0xC8, 0x00};            // 0x72BC92
-    BYTE originalFstp2[6] = {0xD9, 0x1D, 0x24, 0x13, 0xC8, 0x00};            // 0x72C686
-
     MemCpy((LPVOID)0x72BC72, &originalMov, 5);
-    MemCpy((LPVOID)0x72BC92, &originalFstp1, 6);
-    MemCpy((LPVOID)0x72C686, &originalFstp2, 6);
+
+    static constexpr DWORD originalAddr = 0x00C81324;
+    MemPut<DWORD>((LPVOID)(0x72C686 + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BC92 + 2), originalAddr);
 }
 
 float CWeatherSA::GetWetRoads() const
@@ -70,22 +64,22 @@ float CWeatherSA::GetWetRoads() const
 
 bool CWeatherSA::SetWetRoads(float fAmount)
 {
-    MemSet((LPVOID)(0x72BB9F + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BBB7 + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BBD0 + 1), 0x90, 3);
-    MemSet((LPVOID)(0x72BBD7 + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72BB9F + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BBB7 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BBD0 + 1), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BBD7 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC81308, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetWetRoads()
 {
-    BYTE originalCodes[3] = {0x08, 0x13, 0xC8};
-    MemCpy((LPVOID)(0x72BB9F + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BBB7 + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BBD0 + 1), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BBD7 + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C81308;
+    MemPut<DWORD>((LPVOID)(0x72BB9F + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BBB7 + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BBD0 + 1), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BBD7 + 2), originalAddr);
     return true;
 }
 
@@ -96,20 +90,20 @@ float CWeatherSA::GetFoggyness() const
 
 bool CWeatherSA::SetFoggyness(float fAmount)
 {
-    MemSet((LPVOID)(0x72BDF5 + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BDDD + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BE13 + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72BDF5 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BDDD + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BE13 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC81300, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetFoggyness()
 {
-    BYTE originalCodes[3] = {0x00, 0x13, 0xC8};
-    MemCpy((LPVOID)(0x72BDF5 + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BDDD + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BE13 + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C81300;
+    MemPut<DWORD>((LPVOID)(0x72BDF5 + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BDDD + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BE13 + 2), originalAddr);
     return true;
 }
 
@@ -120,20 +114,20 @@ float CWeatherSA::GetFog() const
 
 bool CWeatherSA::SetFog(float fAmount)
 {
-    MemSet((LPVOID)(0x72BE37 + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BE1F + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BE4F + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72BE37 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BE1F + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BE4F + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC812FC, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetFog()
 {
-    BYTE originalCodes[3] = {0xFC, 0x12, 0xC8};
-    MemCpy((LPVOID)(0x72BE37 + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BE1F + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BE4F + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C812FC;
+    MemPut<DWORD>((LPVOID)(0x72BE37 + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BE1F + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BE4F + 2), originalAddr);
     return true;
 }
 
@@ -144,18 +138,18 @@ float CWeatherSA::GetRainFog() const
 
 bool CWeatherSA::SetRainFog(float fAmount)
 {
-    MemSet((LPVOID)(0x72ADD8 + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72ADE4 + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72ADD8 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72ADE4 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC81410, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetRainFog()
 {
-    BYTE originalCodes[3] = {0x10, 0x14, 0xC8};
-    MemCpy((LPVOID)(0x72ADD8 + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72ADE4 + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C81410;
+    MemPut<DWORD>((LPVOID)(0x72ADD8 + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72ADE4 + 2), originalAddr);
     return true;
 }
 
@@ -166,20 +160,20 @@ float CWeatherSA::GetWaterFog() const
 
 bool CWeatherSA::SetWaterFog(float fAmount)
 {
-    MemSet((LPVOID)(0x72C35C + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72C38E + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72C36F + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72C35C + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72C38E + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72C36F + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC81338, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetWaterFog()
 {
-    BYTE originalCodes[3] = {0x38, 0x13, 0xC8};
-    MemCpy((LPVOID)(0x72C35C + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72C38E + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72C36F + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C81338;
+    MemPut<DWORD>((LPVOID)(0x72C35C + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72C38E + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72C36F + 2), originalAddr);
     return true;
 }
 
@@ -190,20 +184,20 @@ float CWeatherSA::GetSandstorm() const
 
 bool CWeatherSA::SetSandstorm(float fAmount)
 {
-    MemSet((LPVOID)(0x72A4B6 + 1), 0x90, 3);
-    MemSet((LPVOID)(0x72BCEB + 1), 0x90, 3);
-    MemSet((LPVOID)(0x72BD0B + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72A4B6 + 1), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BCEB + 1), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BD0B + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC812F4, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetSandstorm()
 {
-    BYTE originalCodes[3] = {0xF4, 0x12, 0xC8};
-    MemCpy((LPVOID)(0x72A4B6 + 1), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BCEB + 1), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BD0B + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C812F4;
+    MemPut<DWORD>((LPVOID)(0x72A4B6 + 1), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BCEB + 1), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BD0B + 2), originalAddr);
     return true;
 }
 
@@ -214,17 +208,17 @@ float CWeatherSA::GetRainbow() const
 
 bool CWeatherSA::SetRainbow(float fAmount)
 {
-    MemSet((LPVOID)(0x72BF51 + 2), 0x90, 3);
-    MemSet((LPVOID)(0x72BF59 + 2), 0x90, 3);
+    MemPut<DWORD>((LPVOID)(0x72BF51 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
+    MemPut<DWORD>((LPVOID)(0x72BF59 + 2), (DWORD)&WEATHER_FAKE_ACCUMULATOR);
 
     MemPutFast<float>(0xC812E4, fAmount);
     return true;
 }
 
 bool CWeatherSA::ResetRainbow()
 {
-    BYTE originalCodes[3] = {0xE4, 0x12, 0xC8};
-    MemCpy((LPVOID)(0x72BF51 + 2), &originalCodes, 3);
-    MemCpy((LPVOID)(0x72BF59 + 2), &originalCodes, 3);
+    static constexpr DWORD originalAddr = 0x00C812E4;
+    MemPut<DWORD>((LPVOID)(0x72BF51 + 2), originalAddr);
+    MemPut<DWORD>((LPVOID)(0x72BF59 + 2), originalAddr);
     return true;
 }
diff --git a/Client/multiplayer_sa/CMultiplayerSA.cpp b/Client/multiplayer_sa/CMultiplayerSA.cpp
@@ -1596,6 +1596,7 @@ void CMultiplayerSA::InitHooks()
 
     InitHooks_Postprocess();
     InitHooks_Explosions();
+    InitHooks_Tasks();
 }
 
 // Used to store copied pointers for explosions in the FxSystem
@@ -6442,7 +6443,12 @@ void _declspec(naked) HOOK_CWorld_Remove_CPopulation_ConvertToDummyObject()
     TIMING_CHECKPOINT("+RemovePointerToBuilding");
     RemovePointerToBuilding();
     StorePointerToBuilding();
-    RemoveObjectIfNeeded();
+
+    // pLODInterface contains a dummy object's pointer
+    // And as follows from CPopulation::ConvertToDummyObject this pointer can be nullptr
+    if (pLODInterface)
+        RemoveObjectIfNeeded();
+
     TIMING_CHECKPOINT("-RemovePointerToBuilding");
     _asm
     {
diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h
@@ -82,6 +82,7 @@ class CMultiplayerSA : public CMultiplayer
     void                InitHooks_Postprocess();
     void                InitHooks_DeviceSelection();
     void                InitHooks_Explosions();
+    void                InitHooks_Tasks();
     CRemoteDataStorage* CreateRemoteDataStorage();
     void                DestroyRemoteDataStorage(CRemoteDataStorage* pData);
     void                AddRemoteDataStorage(CPlayerPed* pPed, CRemoteDataStorage* pData);
diff --git a/Client/multiplayer_sa/CMultiplayerSA_Explosions.cpp b/Client/multiplayer_sa/CMultiplayerSA_Explosions.cpp
@@ -48,11 +48,11 @@ static void _declspec(naked) HOOK_CWorld_TriggerExplosionSectorList()
     {
         // check entity->m_nScanCode == CWorld::ms_nCurrentScanCode
         mov ecx, dword ptr ds:[0xB7CD78]
-        cmp [esi+2Ch], ecx
+        cmp [esi+2Ch], cx
         jz skip
 
         // set entity current scan code
-        mov [esi+2Ch], ecx
+        mov [esi+2Ch], cx
 
         mov al, [esi+36h]
         and al, 7
diff --git a/Client/multiplayer_sa/CMultiplayerSA_Tasks.cpp b/Client/multiplayer_sa/CMultiplayerSA_Tasks.cpp
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ *
+ *  PROJECT:     Multi Theft Auto
+ *  LICENSE:     See LICENSE in the top level directory
+ *  FILE:        multiplayer_sa/CMultiplayerSA_Tasks.cpp
+ *
+ *  Multi Theft Auto is available from https://www.multitheftauto.com/
+ *
+ *****************************************************************************/
+#include "StdInc.h"
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+// CTaskSimplePlayerOnFoot::MakeAbortable
+//
+// If ignorefirestate is enabled, we need this hook to avoid tweaking the aiming animation
+// and the chainsaw turning off when entering fire
+//
+//////////////////////////////////////////////////////////////////////////////////////////
+static bool __IsIgnoreFireStateEnabled()
+{
+    return pGameInterface->IsIgnoreFireStateEnabled();
+}
+
+#define HOOKPOS_CTaskSimplePlayerOnFoot__MakeAbortable  0x68584D
+#define HOOKSIZE_CTaskSimplePlayerOnFoot__MakeAbortable 6
+static constexpr std::uintptr_t RETURN_CTaskSimplePlayerOnFoot__MakeAbortable = 0x68585F;
+static constexpr std::uintptr_t SKIP_CTaskSimplePlayerOnFoot__MakeAbortable = 0x685855;
+static void _declspec(naked) HOOK_CTaskSimplePlayerOnFoot__MakeAbortable()
+{
+    _asm
+    {
+        // return false and keep task alive
+        call dword ptr [eax+8]
+        cmp eax, 3Dh
+        jl skip
+
+        // if eventPriority == 66 (EventOnFire) && IsIgnoreFireStateEnabled()
+        cmp eax, 42h
+        jne continue_logic
+
+        call __IsIgnoreFireStateEnabled
+        test al, al
+        jz continue_logic
+
+        // return true but keep task alive
+        pop edi
+        pop esi
+        pop ebx
+        mov al, 1
+        retn 0Ch
+
+        continue_logic:
+        jmp RETURN_CTaskSimplePlayerOnFoot__MakeAbortable
+
+        skip:
+        jmp SKIP_CTaskSimplePlayerOnFoot__MakeAbortable
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//
+// CMultiplayerSA::InitHooks_Tasks
+//
+// Setup hooks
+//
+//////////////////////////////////////////////////////////////////////////////////////////
+void CMultiplayerSA::InitHooks_Tasks()
+{
+    EZHookInstall(CTaskSimplePlayerOnFoot__MakeAbortable);
+}
diff --git a/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot b/Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-04 20:25+0000\n"
+"POT-Creation-Date: 2025-05-07 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -162,7 +162,7 @@ msgstr ""
 #: Client/mods/deathmatch/logic/CClientGame.cpp:1378
 #: Client/mods/deathmatch/logic/CClientGame.cpp:1427
 #: Client/mods/deathmatch/logic/CClientGame.cpp:1439
-#: Client/game_sa/CGameSA.cpp:261 Client/game_sa/CGameSA.cpp:272
+#: Client/game_sa/CGameSA.cpp:262 Client/game_sa/CGameSA.cpp:273
 #: Shared/mods/deathmatch/logic/CLatentTransferManager.cpp:378
 #: Shared/sdk/SharedUtil.Misc.hpp:137
 msgid "Error"
@@ -266,7 +266,7 @@ msgstr ""
 #: Client/loader/MainFunctions.cpp:1219
 #: Client/core/ServerBrowser/CServerInfo.cpp:319
 #: Client/core/ServerBrowser/CServerBrowser.cpp:1363
-#: Client/game_sa/CGameSA.cpp:268
+#: Client/game_sa/CGameSA.cpp:269
 msgid "Information"
 msgstr ""
 
@@ -3393,11 +3393,11 @@ msgstr[1] ""
 msgid "Disconnected"
 msgstr ""
 
-#: Client/game_sa/CGameSA.cpp:255 Client/game_sa/CGameSA.cpp:266
+#: Client/game_sa/CGameSA.cpp:256 Client/game_sa/CGameSA.cpp:267
 msgid "Failed initialization game_sa"
 msgstr ""
 
-#: Client/game_sa/CGameSA.cpp:257
+#: Client/game_sa/CGameSA.cpp:258
 msgid "Memory allocations failed"
 msgstr ""
 
diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua
