Revert "Make engineRestreamWorld more aggressive (#3602)" (#3605)

This reverts commit a55ad43. Fixes #3604
multitheftauto · Jul 23, 2024 · 1e21c53 · 1e21c53
1 parent 2bdac16
commit 1e21c53
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 22 deletions.
diff --git a/Client/game_sa/CGameSA.cpp b/Client/game_sa/CGameSA.cpp
@@ -1053,21 +1053,6 @@ bool CGameSA::SetBuildingPoolSize(size_t size)
     return status;
 }
 
-void CGameSA::UnloadUnusedModels()
-{
-    for (size_t id = 0; id < GetBaseIDforCOL(); id++)
-    {
-        CStreamingInfo* streamingInfo = m_pStreaming->GetStreamingInfo(id);
-        if (streamingInfo->loadState != 0 && streamingInfo->sizeInBlocks > 0)
-        {
-            if (ModelInfo[id].GetRefCount() == 0)
-            {
-                m_pStreaming->RemoveModel(id);
-            }
-        };
-    }
-}
-
 // Ensure models have the default lod distances
 void CGameSA::ResetModelLodDistances()
 {

diff --git a/Client/game_sa/CGameSA.h b/Client/game_sa/CGameSA.h
@@ -308,8 +308,6 @@ class CGameSA : public CGame
 
     bool SetBuildingPoolSize(size_t size);
 
-    void UnloadUnusedModels();
-
 private:
     CPools*                         m_pPools;
     CPlayerInfo*                    m_pPlayerInfo;

diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
@@ -1067,6 +1067,11 @@ void CModelInfoSA::ModelAddRef(EModelRequestType requestType, const char* szTag)
     m_dwReferences++;
 }
 
+int CModelInfoSA::GetRefCount()
+{
+    return static_cast<int>(m_dwReferences);
+}
+
 void CModelInfoSA::RemoveRef(bool bRemoveExtraGTARef)
 {
     // Decrement the references

diff --git a/Client/game_sa/CModelInfoSA.h b/Client/game_sa/CModelInfoSA.h
@@ -396,7 +396,7 @@ class CModelInfoSA : public CModelInfo
     static void StaticResetAlphaTransparencies();
 
     void ModelAddRef(EModelRequestType requestType, const char* szTag);
-    int  GetRefCount() const override { return static_cast<int>(m_dwReferences); };
+    int  GetRefCount();
     void RemoveRef(bool bRemoveExtraGTARef = false);
     bool ForceUnload();
 

diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -6829,8 +6829,6 @@ void CClientGame::RestreamWorld(bool removeBigBuildings)
         g_pGame->GetStreaming()->RemoveBigBuildings();
 
     g_pGame->GetStreaming()->ReinitStreaming();
-
-    g_pGame->UnloadUnusedModels();
 }
 
 void CClientGame::ReinitMarkers()

diff --git a/Client/sdk/game/CGame.h b/Client/sdk/game/CGame.h
@@ -273,5 +273,4 @@ class __declspec(novtable) CGame
 
     virtual bool SetBuildingPoolSize(size_t size) = 0;
 
-    virtual void UnloadUnusedModels() = 0;
 };
diff --git a/Client/sdk/game/CModelInfo.h b/Client/sdk/game/CModelInfo.h
@@ -177,7 +177,7 @@ class CModelInfo
 
     virtual void ModelAddRef(EModelRequestType requestType, const char* szTag /* = NULL*/) = 0;
     virtual void RemoveRef(bool bRemoveExtraGTARef = false) = 0;
-    virtual int  GetRefCount() const = 0;
+    virtual int  GetRefCount() = 0;
     virtual bool ForceUnload() = 0;
     virtual void DeallocateModel() = 0;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -273,5 +273,4 @@ class __declspec(novtable) CGame

		virtual bool SetBuildingPoolSize(size_t size) = 0;

		virtual void UnloadUnusedModels() = 0;
		};