Make suggested changes

Author: Lamaaar

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6748,7 +6748,7 @@ bool CClientGame::TriggerBrowserRequestResultEvent(const std::unordered_set<SStr
     return GetRootEntity()->CallEvent("onClientBrowserWhitelistChange", Arguments, false);
 }
 
-bool CClientGame::RestreamModel(const std::uint16_t model)
+void CClientGame::RestreamModel(std::uint16_t model)
 {
     // Is this a vehicle ID?
     if (CClientVehicleManager::IsValidModel(model))
@@ -6789,8 +6789,6 @@ bool CClientGame::RestreamModel(const std::uint16_t model)
         // 'Restream' upgrades after model replacement to propagate visual changes with immediate effect
         if (CClientObjectManager::IsValidModel(model) && CVehicleUpgrades::IsUpgrade(model))
             m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(model);
-
-    return true;
 }
 
 void CClientGame::RestreamWorld()
@@ -6849,11 +6847,11 @@ void CClientGame::Restream(std::optional<RestreamOption> option)
         }
 
         m_pManager->GetObjectManager()->RestreamAllObjects();
+        m_pManager->GetPickupManager()->RestreamAllPickups();
     }
 
     if (option == RestreamOption::ALL)
     {
-        m_pManager->GetPickupManager()->RestreamAllPickups();
         g_pGame->GetStreaming()->RemoveBigBuildings();
         g_pGame->GetStreaming()->ReinitStreaming();
     }

Client/mods/deathmatch/logic/CClientGame.h

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

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

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

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

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

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(const std::uint16_t model) = 0;
+    virtual void RestreamModel(std::uint16_t model) = 0;
 
     virtual bool WebsiteRequestResultHandler(const std::unordered_set<SString>& newPages) = 0;