Streamer improvements & fixes

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -426,6 +426,16 @@ CClientGame::~CClientGame()
     // ...and restore the buffer size too
     g_pGame->GetStreaming()->SetStreamingBufferSize(g_pClientGame->GetManager()->GetIMGManager()->GetLargestFileSizeBlocks());
 
+    // Reset streamer limits
+    g_pClientGame->GetManager()->GetObjectStreamer()->ResetStreamerLimits();
+    g_pClientGame->GetManager()->GetObjectStreamer()->ResetStreamerMaxSwaps();
+    g_pClientGame->GetManager()->GetObjectStreamer()->ResetStreamerFurthestInLimit();
+
+    // Reset streamer limits
+    CClientObjectManager* pObjectManager = g_pClientGame->GetObjectManager();
+    if (pObjectManager)
+        pObjectManager->ResetMaxObjectStreamCount();
+
     // Reset camera shaking
     g_pGame->GetCamera()->SetShakeForce(0.0f);
 

Client/mods/deathmatch/logic/CClientObjectManager.cpp

@@ -245,8 +245,12 @@ bool CClientObjectManager::StaticIsLowLodObjectLimitReached()
 
 bool CClientObjectManager::IsObjectLimitReached()
 {
-    if (IsHardObjectLimitReached() || m_uiStreamedInCount >= m_uiMaxStreamedInCount)
+    if (IsHardObjectLimitReached() || (m_uiCustomMaxStreamedInCount > 0 && m_uiStreamedInCount >= m_uiCustomMaxStreamedInCount) ||
+        m_uiStreamedInCount >= m_uiMaxStreamedInCount)
+    {
         return true;
+    }
+
     return false;
 }
 
@@ -333,3 +337,24 @@ bool CClientObjectManager::Exists(CClientObject* pObject)
 {
     return ListContains(m_Objects, pObject);
 }
+
+void CClientObjectManager::SetMaxObjectStreamCount(int cValue)
+{
+    if (cValue < m_uiMaxStreamedInCount)
+        throw std::invalid_argument("Custom limit must be greater than or equal to default limit");
+
+    m_uiCustomMaxStreamedInCount = cValue;
+}
+
+void CClientObjectManager::ResetMaxObjectStreamCount()
+{
+    m_uiCustomMaxStreamedInCount = 0;
+}
+
+int CClientObjectManager::GetMaxObjectStreamCount()
+{
+    if (m_uiCustomMaxStreamedInCount > 0)
+        return m_uiCustomMaxStreamedInCount;
+
+    return m_uiMaxStreamedInCount;
+}

Client/mods/deathmatch/logic/CClientObjectManager.h

@@ -42,6 +42,9 @@ class CClientObjectManager
     bool        IsObjectLimitReached();
     bool        IsLowLodObjectLimitReached();
     bool        IsHardObjectLimitReached();
+    int         GetMaxObjectStreamCount();
+    void        SetMaxObjectStreamCount(int customCount);
+    void        ResetMaxObjectStreamCount();
 
     void RestreamObjects(unsigned short usModel);
     void RestreamAllObjects();
@@ -58,6 +61,7 @@ class CClientObjectManager
     int  m_iEntryInfoNodeEntries;
     int  m_iPointerNodeDoubleLinkEntries;
     uint m_uiMaxStreamedInCount;
+    uint m_uiCustomMaxStreamedInCount;
     uint m_uiMaxLowLodStreamedInCount;
     uint m_uiStreamedInCount;
     uint m_uiLowLodStreamedInCount;

Client/mods/deathmatch/logic/CClientStreamSector.h

@@ -37,6 +37,7 @@ class CClientStreamSector
     void                                       Remove(CClientStreamElement* pElement) { m_Elements.remove(pElement); }
     std::list<CClientStreamElement*>::iterator Begin() { return m_Elements.begin(); }
     std::list<CClientStreamElement*>::iterator End() { return m_Elements.end(); }
+    std::list<CClientStreamElement*>&          GetElements() { return m_Elements; }
 
     void         AddElements(std::list<CClientStreamElement*>* pList);
     void         RemoveElements(std::list<CClientStreamElement*>* pList);

Client/mods/deathmatch/logic/CClientStreamSectorRow.h

@@ -28,6 +28,7 @@ class CClientStreamSectorRow
     std::list<CClientStreamSector*>::iterator Begin() { return m_Sectors.begin(); }
     std::list<CClientStreamSector*>::iterator End() { return m_Sectors.end(); }
     CClientStreamSector*                      Front() { return m_Sectors.front(); }
+    std::list<CClientStreamSector*>&          GetList() { return m_Sectors; }
     void                                      Add(CClientStreamSector* pSector);
     void                                      Remove(CClientStreamSector* pSector);
     unsigned int                              CountSectors() { return m_Sectors.size(); }