Merge branch 'master' into fix/improve-aclrequest-detection

Author: MohabCodeX

Client/game_sa/CRenderWareSA.TextureReplacing.cpp

@@ -32,7 +32,6 @@ class CRenderWareSA : public CRenderWare
     bool ModelInfoTXDLoadTextures(SReplacementTextures* pReplacementTextures, const SString& strFilename, const SString& buffer, bool bFilteringEnabled);
     bool ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTextures, ushort usModelId);
     void ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacementTextures);
-    void ModelInfoTXDCleanupOrphanedEntries();
     void ClothesAddReplacement(char* pFileData, size_t fileSize, ushort usFileId);
     void ClothesRemoveReplacement(char* pFileData);
     bool HasClothesReplacementChanged();

Client/game_sa/CRenderWareSA.h

@@ -1360,11 +1360,8 @@ void CVehicleSA::SetHandlingData(CHandlingEntry* pHandling)
     // Store the handling and recalculate it
     m_pHandlingData = static_cast<CHandlingEntrySA*>(pHandling);
     pVehicleInterface->pHandlingData = m_pHandlingData->GetInterface();
-    
-    // Only recalculate if collision model is loaded (needed for suspension lines)
-    CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex());
-    if (pModelInfo && pModelInfo->GetInterface()->pColModel && pModelInfo->GetInterface()->pColModel->m_data)
-        RecalculateHandling();
+
+    RecalculateHandling();
 }
 
 void CVehicleSA::SetFlyingHandlingData(CFlyingHandlingEntry* pFlyingHandling)
@@ -1385,16 +1382,18 @@ void CVehicleSA::RecalculateHandling()
     if (!pInt)
         return;
 
-    // Ensure collision model is loaded before recalculating (needed for suspension lines)
     CModelInfo* pModelInfo = pGame->GetModelInfo(GetModelIndex());
-    if (!pModelInfo || !pModelInfo->GetInterface()->pColModel || !pModelInfo->GetInterface()->pColModel->m_data)
-        return;
+    auto* pModelInterface = pModelInfo ? pModelInfo->GetInterface() : nullptr;
+    auto* pColModelInterface = pModelInterface ? pModelInterface->pColModel : nullptr;
+    bool  bSuspensionDataReady = pColModelInterface && pColModelInterface->m_data;
+    bool  bHasSuspension = pModelInfo &&
+                      (pModelInfo->IsCar() || pModelInfo->IsMonsterTruck() || pModelInfo->IsTrailer() || pModelInfo->IsBike());
 
     m_pHandlingData->Recalculate();
 
     // Recalculate the suspension lines (only for vehicles that have suspension)
-    // Already validated that pColModel and m_data exist above
-    if (pModelInfo->IsCar() || pModelInfo->IsMonsterTruck() || pModelInfo->IsTrailer() || pModelInfo->IsBike())
+    // Skip until collision data streams in to avoid accessing null suspension lines
+    if (bSuspensionDataReady && bHasSuspension)
         RecalculateSuspensionLines();
 
     // Put it in our interface
@@ -1846,13 +1845,30 @@ void CVehicleSA::RecalculateSuspensionLines()
             return;
 
         // Ensure collision model is loaded before setting up suspension
-        if (!pModelInfo->GetInterface()->pColModel || !pModelInfo->GetInterface()->pColModel->m_data)
+        auto* pColModelInterface = pModelInfo->GetInterface()->pColModel;
+        if (!pColModelInterface || !pColModelInterface->m_data)
             return;
 
-        // Note: We skip calling SetupSuspensionLines() because it's GTA SA's native code that can
-        // access pColModel->m_data without validation. If collision model is unloaded during execution
-        // (race condition), it causes crashes. CopyGlobalSuspensionLinesToPrivate() is safer as it
-        // validates collision model before accessing.
+        struct ScopedModelRef
+        {
+            explicit ScopedModelRef(CModelInfo* model)
+                : m_Model(model)
+            {
+                if (m_Model)
+                    m_Model->ModelAddRef(EModelRequestType::BLOCKING, "CVehicleSA::RecalculateSuspensionLines");
+            }
+
+            ~ScopedModelRef()
+            {
+                if (m_Model)
+                    m_Model->RemoveRef();
+            }
+
+            CModelInfo* m_Model;
+        } modelRef(pModelInfo);
+
+        GetVehicleInterface()->SetupSuspensionLines();
+
         CopyGlobalSuspensionLinesToPrivate();
     }
 }

Client/game_sa/CVehicleSA.cpp

@@ -1498,17 +1498,6 @@ void CClientGame::DoPulses()
     // Collect async task scheduler results
     m_pAsyncTaskScheduler->CollectResults();
 
-    // Periodically cleanup orphaned texture replacement entries (every ~5 minutes)
-    {
-        static int s_iCleanupFrameCounter = 0;
-        constexpr int CLEANUP_INTERVAL = 18000;            // ~5 minutes at 60 FPS
-        if (++s_iCleanupFrameCounter >= CLEANUP_INTERVAL)
-        {
-            s_iCleanupFrameCounter = 0;
-            g_pGame->GetRenderWare()->ModelInfoTXDCleanupOrphanedEntries();
-        }
-    }
-
     TIMING_CHECKPOINT("-CClientGame::DoPulses");
 }
 

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -48,7 +48,6 @@ project "Client Deathmatch"
 
 	files {
 		"premake5.lua",
-		"logic/RenderWareTextureGlobals.cpp",
 		"**.h",
 		"**.cpp",
 		"../../../Shared/mods/deathmatch/logic/**.cpp",

Client/mods/deathmatch/logic/RenderWareTextureGlobals.cpp

@@ -11,16 +11,8 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
 #include <vector>
 
-#include "RenderWare.h"
-
 class CClientEntityBase;
 class CD3DDUMMY;
 class CMatrix;
@@ -37,62 +29,21 @@ struct RpClump;
 
 typedef CShaderItem CSHADERDUMMY;
 
-extern int (__cdecl* RwTextureDestroy)(RwTexture* texture);
-inline int (__cdecl*& gRwTextureDestroy)(RwTexture* texture) = RwTextureDestroy;
-
 // A list of custom textures to add to a model's txd
 struct SReplacementTextures
 {
-    struct RwTextureDeleter
-    {
-        void operator()(RwTexture* texture) const noexcept
-        {
-            if (!texture)
-                return;
-
-            // Fast validation: Check if pointer looks reasonable (not in low invalid range)
-            // This catches most corruption cases without expensive VirtualQuery
-            const uintptr_t addr = reinterpret_cast<uintptr_t>(texture);
-            constexpr uintptr_t kMinUserAddress = 0x10000;        // Below this is always invalid (null page protection)
-            
-            // Note: Upper bound check not needed on x86 with LARGEADDRESSAWARE, as MTA has (full 4GB accessible)
-            // On x86, uintptr_t cannot exceed 0xFFFFFFFF, so all pointers >= 0x10000 are potentially valid
-            if (addr < kMinUserAddress)
-                return;
-
-            // Only destroy if texture is orphaned (not owned by any TXD)
-            // If txd != nullptr, the TXD owns it and will destroy it
-            // Note: We access texture->txd without IsReadablePointer for performance.
-            // If the pointer is invalid, we'll crash here, but that's acceptable vs
-            // the cost of VirtualQuery on every texture destruction (1-2ms per 1000 textures).
-            // The address range check above catches most corruption cases.
-            if (texture->txd == nullptr && RwTextureDestroy)
-            {
-                RwTextureDestroy(texture);
-            }
-        }
-    };
-
-    using TextureOwner = std::unique_ptr<RwTexture, RwTextureDeleter>;
-
     struct SPerTxd
     {
         std::vector<RwTexture*> usingTextures;
         std::vector<RwTexture*> replacedOriginals;
-        std::vector<ushort>     modelIdsUsingTxd;
-        std::vector<TextureOwner> ownedClones;
-        ushort                  usTxdId = 0;
-        bool                    bTexturesAreCopies = false;
+        ushort                  usTxdId;
+        bool                    bTexturesAreCopies;
     };
 
-    std::vector<RwTexture*>   textures;            // Raw pointers to textures (for compatibility)
-    std::vector<SPerTxd>      perTxdList;          // TXD's which have been modified
-    std::vector<ushort>       usedInTxdIds;
+    std::vector<RwTexture*> textures;              // List of textures we want to inject into TXD's
+    std::vector<SPerTxd>    perTxdList;            // TXD's which have been modified
+    std::vector<ushort>     usedInTxdIds;
     std::vector<ushort>     usedInModelIds;
-    std::unordered_set<ushort> usedInTxdIdLookup;
-    std::unordered_set<ushort> usedInModelIdLookup;
-    std::unordered_map<ushort, std::size_t> perTxdIndexLookup;
-    std::vector<TextureOwner> ownedTextures;       // Owned textures with automatic lifetime management (MUST BE LAST for binary compatibility)
 };
 
 // Shader layers to render
@@ -126,7 +77,6 @@ class CRenderWare
                                                       bool bFilteringEnabled) = 0;
     virtual bool             ModelInfoTXDAddTextures(SReplacementTextures* pReplacementTextures, ushort usModelId) = 0;
     virtual void             ModelInfoTXDRemoveTextures(SReplacementTextures* pReplacementTextures) = 0;
-    virtual void             ModelInfoTXDCleanupOrphanedEntries() = 0;
     virtual void             ClothesAddReplacement(char* pFileData, size_t fileSize, ushort usFileId) = 0;
     virtual void             ClothesRemoveReplacement(char* pFileData) = 0;
     virtual bool             HasClothesReplacementChanged() = 0;

Client/mods/deathmatch/premake5.lua

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-24 01:59+0000\n"
+"POT-Creation-Date: 2025-10-27 10:21+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"
@@ -3429,23 +3429,23 @@ msgstr ""
 msgid "MTA Client verification failed!"
 msgstr ""
 
-#: Client/mods/deathmatch/logic/CClientGame.cpp:5685
+#: Client/mods/deathmatch/logic/CClientGame.cpp:5674
 msgid "In a ditch"
 msgstr ""
 
-#: Client/mods/deathmatch/logic/CClientGame.cpp:5685
+#: Client/mods/deathmatch/logic/CClientGame.cpp:5674
 msgid "En-route to hospital"
 msgstr ""
 
-#: Client/mods/deathmatch/logic/CClientGame.cpp:5685
+#: Client/mods/deathmatch/logic/CClientGame.cpp:5674
 msgid "Meeting their maker"
 msgstr ""
 
-#: Client/mods/deathmatch/logic/CClientGame.cpp:5685
+#: Client/mods/deathmatch/logic/CClientGame.cpp:5674
 msgid "Regretting their decisions"
 msgstr ""
 
-#: Client/mods/deathmatch/logic/CClientGame.cpp:5685
+#: Client/mods/deathmatch/logic/CClientGame.cpp:5674
 msgid "Wasted"
 msgstr ""