Make suggested changes

Author: Lamaaar

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6748,47 +6748,49 @@ bool CClientGame::TriggerBrowserRequestResultEvent(const std::unordered_set<SStr
     return GetRootEntity()->CallEvent("onClientBrowserWhitelistChange", Arguments, false);
 }
 
-bool CClientGame::RestreamModel(unsigned short usModel)
+bool CClientGame::RestreamModel(const std::uint16_t model)
 {
     // Is this a vehicle ID?
-    if (CClientVehicleManager::IsValidModel(usModel))
+    if (CClientVehicleManager::IsValidModel(model))
     {
         // Stream the vehicles of that model out so we have no
         // loaded when we do the restore. The streamer will
         // eventually stream them back in with async loading.
-        m_pManager->GetVehicleManager()->RestreamVehicles(usModel);
+        m_pManager->GetVehicleManager()->RestreamVehicles(model);
     }
 
     // Is this an object ID?
-    else if (CClientObjectManager::IsValidModel(usModel))
+    else if (CClientObjectManager::IsValidModel(model))
     {
-        if (CClientPedManager::IsValidWeaponModel(usModel))
+        if (CClientPedManager::IsValidWeaponModel(model))
         {
             // Stream the weapon of that model out so we have no
             // loaded when we do the restore. The streamer will
             // eventually stream them back in with async loading.
-            m_pManager->GetPedManager()->RestreamWeapon(usModel);
-            m_pManager->GetPickupManager()->RestreamPickups(usModel);
+            m_pManager->GetPedManager()->RestreamWeapon(model);
+            m_pManager->GetPickupManager()->RestreamPickups(model);
         }
         // Stream the objects of that model out so we have no
         // loaded when we do the restore. The streamer will
         // eventually stream them back in with async loading.
-        m_pManager->GetObjectManager()->RestreamObjects(usModel);
-        g_pGame->GetModelInfo(usModel)->RestreamIPL();
+        m_pManager->GetObjectManager()->RestreamObjects(model);
+        g_pGame->GetModelInfo(model)->RestreamIPL();
     }
     // Is this an ped ID?
-    else if (CClientPlayerManager::IsValidModel(usModel))
+    else if (CClientPlayerManager::IsValidModel(model))
     {
         // Stream the ped of that model out so we have no
         // loaded when we do the restore. The streamer will
         // eventually stream them back in with async loading.
-        m_pManager->GetPedManager()->RestreamPeds(usModel);
+        m_pManager->GetPedManager()->RestreamPeds(model);
     }
     else
 
         // 'Restream' upgrades after model replacement to propagate visual changes with immediate effect
-        if (CClientObjectManager::IsValidModel(usModel) && CVehicleUpgrades::IsUpgrade(usModel))
-            m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(usModel);
+        if (CClientObjectManager::IsValidModel(model) && CVehicleUpgrades::IsUpgrade(model))
+            m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(model);
+
+    return true;
 }
 
 void CClientGame::RestreamWorld()

Client/mods/deathmatch/logic/CClientGame.h

@@ -465,7 +465,7 @@ class CClientGame
     bool    IsHighFloatPrecision() const;
 
     bool TriggerBrowserRequestResultEvent(const std::unordered_set<SString>& newPages);
-    void RestreamModel(unsigned short usModel);
+    bool RestreamModel(const std::uint16_t model);
     void RestreamWorld();
     void Restream(std::optional<RestreamOption> option);
     void ReinitMarkers();

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

@@ -2597,7 +2597,7 @@ void CLuaEngineDefs::EnginePreloadWorldArea(CVector position, std::optional<Prel
         g_pGame->GetStreaming()->LoadSceneCollision(&position);
 }
 
-bool CLuaEngineDefs::EngineRestreamModel(std::uint16_t modelId)
+bool CLuaEngineDefs::EngineRestreamModel(const std::uint16_t modelId)
 {
     return g_pClientGame->RestreamModel(modelId);
 }

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

@@ -96,7 +96,7 @@ class CLuaEngineDefs : public CLuaDefs
     static eModelLoadState EngineStreamingGetModelLoadState(std::uint16_t modelId);
 
     static void EnginePreloadWorldArea(CVector position, std::optional<PreloadAreaOption> option);
-    static bool EngineRestreamModel(std::uint16_t modelId);
+    static bool EngineRestreamModel(const std::uint16_t modelId);
     static bool EngineRestream(std::optional<RestreamOption> option);
 
 private:

Client/sdk/core/CClientBase.h

@@ -24,7 +24,7 @@ class CClientBase
     virtual void PreHUDRenderExecutionHandler(bool bDidUnminimize, bool bDidRecreateRenderTargets) = 0;
     virtual void PostFrameExecutionHandler() = 0;
     virtual void IdleHandler() = 0;
-    virtual void RestreamModel(unsigned short usModel) = 0;
+    virtual void RestreamModel(const std::uint16_t model) = 0;
 
     virtual bool WebsiteRequestResultHandler(const std::unordered_set<SString>& newPages) = 0;