Addendum to 93e6ae8 (Fix build error, only happens on build server due to net include)

Author: Dutchman101

Client/core/CModelCacheManager.cpp

@@ -47,7 +47,7 @@ class CModelCacheManagerImpl : public CModelCacheManager
     virtual void OnClientClose();
     virtual void UpdatePedModelCaching(const std::map<ushort, float>& newNeedCacheList);
     virtual void UpdateVehicleModelCaching(const std::map<ushort, float>& newNeedCacheList);
-    virtual void SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds);
+    virtual void SetCustomLimits(const size_t* numVehicles, const size_t* numPeds);
 
     // CModelCacheManagerImpl methods
     CModelCacheManagerImpl();
@@ -224,13 +224,13 @@ void CModelCacheManagerImpl::GetStats(SModelCacheStats& outStats)
 // Function to set custom limits, instead of calculating them automatically.
 // If the optional is empty, the value is restored to the automatic one
 // otherwise it is set to whatever value the opt contains
-// 
+//
 ///////////////////////////////////////////////////////////////
-void CModelCacheManagerImpl::SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds) {
-    if (m_IsUsingCustomPedCacheLimit = numPeds.has_value()) {
+void CModelCacheManagerImpl::SetCustomLimits(const size_t* numVehicles, const size_t* numPeds) {
+    if (m_IsUsingCustomPedCacheLimit = (numPeds != nullptr)) {
         m_uiMaxCachedPedModels = *numPeds;
     }
-    if (m_IsUsingCustomVehicleCacheLimit = numVehicles.has_value()) {
+    if (m_IsUsingCustomVehicleCacheLimit = (numVehicles != nullptr)) {
         m_uiMaxCachedVehicleModels = *numVehicles;
     }
 }
@@ -524,5 +524,5 @@ void CModelCacheManagerImpl::OnRestreamModel(ushort usModelId)
                 OutputDebugLine(SString("[Cache] End caching model %d  (OnRestreamModel)", usModelId));
             }
         }
-    }   
+    }
 }

Client/core/CModelCacheManager.h

@@ -7,8 +7,6 @@
  *
  *****************************************************************************/
 
-#include <optional>
-
 struct SModelCacheStats;
 
 class CModelCacheManager
@@ -24,7 +22,7 @@ class CModelCacheManager
     virtual void OnClientClose() = 0;
     virtual void UpdatePedModelCaching(const std::map<ushort, float>& newNeedCacheList) = 0;
     virtual void UpdateVehicleModelCaching(const std::map<ushort, float>& newNeedCacheList) = 0;
-    virtual void SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds) = 0;
+    virtual void SetCustomLimits(const size_t* numVehicles, const size_t* numPeds) = 0;
 };
 
 CModelCacheManager* NewModelCacheManager();

Client/mods/deathmatch/logic/CClientModelCacheManager.cpp

@@ -38,7 +38,7 @@ class CClientModelCacheManagerImpl : public CClientModelCacheManager
     // CClientModelCacheManager interface
     virtual void DoPulse();
     virtual void OnRestreamModel(ushort usModelId);
-    virtual void SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds);
+    virtual void SetCustomLimits(const size_t* numVehicles, const size_t* numPeds);
 
     // CClientModelCacheManagerImpl methods
     CClientModelCacheManagerImpl();
@@ -520,7 +520,7 @@ void CClientModelCacheManagerImpl::OnRestreamModel(ushort usModelId)
     m_pCoreModelCacheManager->OnRestreamModel(usModelId);
 }
 
-void CClientModelCacheManagerImpl::SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds)
+void CClientModelCacheManagerImpl::SetCustomLimits(const size_t* numVehicles, const size_t* numPeds)
 {
     m_pCoreModelCacheManager->SetCustomLimits(numVehicles, numPeds);
 }

Client/mods/deathmatch/logic/CClientModelCacheManager.h

@@ -15,7 +15,7 @@ class CClientModelCacheManager
     // CClientModelCacheManager interface
     virtual void DoPulse() = 0;
     virtual void OnRestreamModel(ushort usModelId) = 0;
-    virtual void SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds) = 0;
+    virtual void SetCustomLimits(const size_t* numVehicles, const size_t* numPeds) = 0;
 };
 
 CClientModelCacheManager* NewClientModelCacheManager();

Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp

@@ -21,7 +21,12 @@
 //! Set the CModelCacheManager limits
 //! By passing `nil`/no value the original values are restored
 void EngineStreamingSetModelCacheLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds) {
-    g_pClientGame->GetModelCacheManager()->SetCustomLimits(numVehicles, numPeds);
+    const size_t veh = numVehicles.value_or(0);
+    const size_t ped = numPeds.value_or(0);
+    g_pClientGame->GetModelCacheManager()->SetCustomLimits(
+        numVehicles.has_value() ? &veh : nullptr,
+        numPeds.has_value() ? &ped : nullptr
+    );
 }
 
 void EngineStreamingFreeUpMemory(std::uint32_t bytes)
@@ -150,7 +155,7 @@ void CLuaEngineDefs::LoadFunctions()
         {"engineGetPoolUsedCapacity", ArgumentParser<EngineGetPoolUsedCapacity>},
         {"engineSetPoolCapacity", ArgumentParser<EngineSetPoolCapacity>},
         {"enginePreloadWorldArea", ArgumentParser<EnginePreloadWorldArea>},
-        
+
         // CLuaCFunctions::AddFunction ( "engineReplaceMatchingAtomics", EngineReplaceMatchingAtomics );
         // CLuaCFunctions::AddFunction ( "engineReplaceWheelAtomics", EngineReplaceWheelAtomics );
         // CLuaCFunctions::AddFunction ( "enginePositionAtomic", EnginePositionAtomic );