diff options
| author | aap <aap@papnet.eu> | 2021-01-09 11:43:58 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-09 11:43:58 +0100 |
| commit | 225b8953fd031de426d2d2c7f40ea6440c0ffd15 (patch) | |
| tree | a28ccdbb70276de697d8075cf3a10de5a85e7537 /src/core | |
| parent | Sector sizes (diff) | |
| download | re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.tar re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.tar.gz re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.tar.bz2 re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.tar.lz re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.tar.xz re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.tar.zst re3-225b8953fd031de426d2d2c7f40ea6440c0ffd15.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Streaming.cpp | 25 | ||||
| -rw-r--r-- | src/core/Streaming.h | 7 |
2 files changed, 18 insertions, 14 deletions
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index 3a6fdc2a..4fff2367 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1151,12 +1151,9 @@ CStreaming::RemoveModel(int32 id) void CStreaming::RemoveUnusedBuildings(eLevelName level) { - if(level != LEVEL_INDUSTRIAL) - RemoveBuildings(LEVEL_INDUSTRIAL); - if(level != LEVEL_COMMERCIAL) - RemoveBuildings(LEVEL_COMMERCIAL); - if(level != LEVEL_SUBURBAN) - RemoveBuildings(LEVEL_SUBURBAN); + for(int i = LEVEL_INDUSTRIAL; i < NUM_LEVELS; i++) + if(level != i) + RemoveBuildings((eLevelName)i); } void @@ -1279,12 +1276,9 @@ CStreaming::RemoveUnusedBigBuildings(eLevelName level) { ISLAND_LOADING_IS(LOW) { - if(level != LEVEL_INDUSTRIAL) - RemoveBigBuildings(LEVEL_INDUSTRIAL); - if(level != LEVEL_COMMERCIAL) - RemoveBigBuildings(LEVEL_COMMERCIAL); - if(level != LEVEL_SUBURBAN) - RemoveBigBuildings(LEVEL_SUBURBAN); + for(int i = LEVEL_INDUSTRIAL; i < NUM_LEVELS; i++) + if(level != i) + RemoveBuildings((eLevelName)i); } RemoveIslandsNotUsed(level); } @@ -1324,8 +1318,11 @@ CStreaming::RemoveIslandsNotUsed(eLevelName level) } #ifdef NO_ISLAND_LOADING if(FrontEndMenuManager.m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_HIGH) { - DeleteIsland(pIslandLODmainlandEntity); - DeleteIsland(pIslandLODbeachEntity); + DeleteIsland(pIslandLODindustEntity); + DeleteIsland(pIslandLODcomIndEntity); + DeleteIsland(pIslandLODcomSubEntity); + DeleteIsland(pIslandLODsubIndEntity); + DeleteIsland(pIslandLODsubComEntity); } else #endif switch(level){ diff --git a/src/core/Streaming.h b/src/core/Streaming.h index a67384f6..0f34aca5 100644 --- a/src/core/Streaming.h +++ b/src/core/Streaming.h @@ -213,3 +213,10 @@ public: static void PrintStreamingBufferState(); }; + +// LCS(TODO): put them into CStreaming::mspInst +extern int32 islandLODindust; +extern int32 islandLODcomInd; +extern int32 islandLODcomSub; +extern int32 islandLODsubInd; +extern int32 islandLODsubCom; |