Skip to content

Commit f7eacf0

Browse files
authored
Remove unnecessary argument in engineRestreamWorld (#3594)
1 parent a3f6d01 commit f7eacf0

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

Client/mods/deathmatch/logic/CClientGame.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5590,7 +5590,7 @@ void CClientGame::ResetMapInfo()
55905590
if (pPlayerInfo)
55915591
pPlayerInfo->SetCamDrunkLevel(static_cast<byte>(0));
55925592

5593-
RestreamWorld(true);
5593+
RestreamWorld();
55945594

55955595
ReinitMarkers();
55965596
}
@@ -6813,7 +6813,7 @@ void CClientGame::RestreamModel(unsigned short usModel)
68136813
m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(usModel);
68146814
}
68156815

6816-
void CClientGame::RestreamWorld(bool removeBigBuildings)
6816+
void CClientGame::RestreamWorld()
68176817
{
68186818
unsigned int numberOfFileIDs = g_pGame->GetCountOfAllFileIDs();
68196819

@@ -6826,9 +6826,7 @@ void CClientGame::RestreamWorld(bool removeBigBuildings)
68266826
m_pManager->GetPedManager()->RestreamAllPeds();
68276827
m_pManager->GetPickupManager()->RestreamAllPickups();
68286828

6829-
if (removeBigBuildings)
6830-
g_pGame->GetStreaming()->RemoveBigBuildings();
6831-
6829+
g_pGame->GetStreaming()->RemoveBigBuildings();
68326830
g_pGame->GetStreaming()->ReinitStreaming();
68336831
}
68346832

Client/mods/deathmatch/logic/CClientGame.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ class CClientGame
441441

442442
bool TriggerBrowserRequestResultEvent(const std::unordered_set<SString>& newPages);
443443
void RestreamModel(unsigned short usModel);
444-
void RestreamWorld(bool removeBigBuildings);
444+
void RestreamWorld();
445445
void ReinitMarkers();
446446

447447
void OnWindowFocusChange(bool state);

Client/mods/deathmatch/logic/CClientIMG.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ bool CClientIMG::StreamDisable()
191191

192192
m_pImgManager->UpdateStreamerBufferSize();
193193

194-
g_pClientGame->RestreamWorld(true);
194+
g_pClientGame->RestreamWorld();
195195
return true;
196196
}
197197

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2428,14 +2428,9 @@ bool CLuaEngineDefs::EngineResetModelFlags(uint uiModelID)
24282428
return false;
24292429
}
24302430

2431-
bool CLuaEngineDefs::EngineRestreamWorld(lua_State* const luaVM)
2431+
bool CLuaEngineDefs::EngineRestreamWorld()
24322432
{
2433-
bool restreamLODs{};
2434-
2435-
CScriptArgReader argStream(luaVM);
2436-
argStream.ReadBool(restreamLODs, false);
2437-
2438-
g_pClientGame->RestreamWorld(restreamLODs);
2433+
g_pClientGame->RestreamWorld();
24392434
return true;
24402435
}
24412436

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CLuaEngineDefs : public CLuaDefs
7676
static bool EngineRestoreTXDImage(uint uiModelID);
7777
static std::vector<std::string_view> EngineImageGetFileList(CClientIMG* pImg);
7878
static std::string EngineImageGetFile(CClientIMG* pImg, std::variant<size_t, std::string_view> file);
79-
static bool EngineRestreamWorld(lua_State* const luaVM);
79+
static bool EngineRestreamWorld();
8080
static bool EngineSetModelVisibleTime(std::string strModelId, char cHourOn, char cHourOff);
8181
static std::variant<bool, CLuaMultiReturn<char, char>> EngineGetModelVisibleTime(std::string strModelId);
8282

0 commit comments

Comments
 (0)