Better checks

TheNormalnij · Aug 27, 2024 · a4d7aac · a4d7aac
1 parent 58247b8
commit a4d7aac
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp
@@ -1051,17 +1051,29 @@ bool CGameSA::SetBuildingPoolSize(size_t size)
 
 void CGameSA::UnloadUnusedModels()
 {
-    for (std::size_t id = 0; id < GetBaseIDforCOL(); id++)
+    // Unload DFF's
+    // CJ should not be unloaded
+    const std::size_t baseIdForTxd = GetBaseIDforTXD();
+    for (std::size_t id = 1; id < baseIdForTxd; id++)
     {
         CStreamingInfo* streamingInfo = m_pStreaming->GetStreamingInfo(id);
         if (streamingInfo->loadState != eModelLoadState::LOADSTATE_NOT_LOADED && streamingInfo->sizeInBlocks > 0)
         {
-            if (ModelInfo[id].GetRefCount() == 0)
-            {
-                m_pStreaming->RemoveModel(id);
-            }
+            CModelInfoSA& model = ModelInfo[id];
+            if (model.GetRefCount() == 0)
+                model.UnloadUnused();
         };
     }
+    // Unload TXD
+    for (std::size_t id = baseIdForTxd; id < GetBaseIDforCOL(); id++)
+    {
+        CStreamingInfo* streamingInfo = m_pStreaming->GetStreamingInfo(id);
+        std::size_t     refsCount = GetPools()->GetTxdPool().GetRefsCount(id - baseIdForTxd);
+        if (streamingInfo->loadState != eModelLoadState::LOADSTATE_NOT_LOADED && streamingInfo->sizeInBlocks > 0 && refsCount == 0)
+        {
+            GetStreaming()->RemoveModel(id);
+        }
+    }
 }
 
 // Ensure models have the default lod distances

diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
@@ -442,6 +442,8 @@ void CModelInfoSA::Remove()
 
 bool CModelInfoSA::UnloadUnused()
 {
+    m_pInterface = ppModelInfo[m_dwModelID];
+
     if (m_pInterface->usNumberOfRefs == 0 && !m_pCustomClump && !m_pCustomColModel)
     {
         pGame->GetStreaming()->RemoveModel(m_dwModelID);

diff --git a/Client/game_sa/CPoolSAInterface.h b/Client/game_sa/CPoolSAInterface.h
@@ -122,7 +122,7 @@ class CPoolSAInterface
         return !IsEmpty(index);
     }
 
-    B* GetObject(std::int32_t objectIndex) { return &m_pObjects[objectIndex]; }
+    B* GetObject(std::int32_t objectIndex) const { return &m_pObjects[objectIndex]; }
 
     uint GetObjectIndex(B* pObject) { return ((DWORD)pObject - (DWORD)m_pObjects) / sizeof(B); }
 

diff --git a/Client/game_sa/CTxdPoolSA.cpp b/Client/game_sa/CTxdPoolSA.cpp
@@ -55,3 +55,12 @@ std::uint16_t CTxdPoolSA::GetFreeTextureDictonarySlot()
 {
     return (*m_ppTxdPoolInterface)->GetFreeSlot();
 }
+
+std::uint16_t CTxdPoolSA::GetRefsCount(std::uint16_t slot) const
+{
+    CTextureDictonarySAInterface* pTxd = (*m_ppTxdPoolInterface)->GetObject(slot);
+    if (!pTxd)
+        return -1;
+
+    return pTxd->usUsagesCount;
+}
diff --git a/Client/game_sa/CTxdPoolSA.h b/Client/game_sa/CTxdPoolSA.h
@@ -25,6 +25,7 @@ class CTxdPoolSA final : public CTxdPool
     bool          IsFreeTextureDictonarySlot(std::uint32_t uiTxdId);
 
     std::uint16_t GetFreeTextureDictonarySlot();
+    std::uint16_t GetRefsCount(std::uint16_t slot) const;
 
 private:
     CPoolSAInterface<CTextureDictonarySAInterface>** m_ppTxdPoolInterface;

diff --git a/Client/sdk/game/CTxdPool.h b/Client/sdk/game/CTxdPool.h
@@ -19,4 +19,5 @@ class CTxdPool
     virtual bool          IsFreeTextureDictonarySlot(std::uint32_t uiTxdID) = 0;
 
     virtual std::uint16_t GetFreeTextureDictonarySlot() = 0;
+    virtual std::uint16_t GetRefsCount(std::uint16_t slot) const = 0;
 };