diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-08-16 20:02:48 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-08-16 20:02:48 +0200 |
| commit | 27653343666fae5529946535a5e80e4b8819a624 (patch) | |
| tree | 4fffe2c69e0deac67c8e99bed1e82bd21eeb276f /src/save | |
| parent | sync with master (diff) | |
| parent | remove CFO (diff) | |
| download | re3-27653343666fae5529946535a5e80e4b8819a624.tar re3-27653343666fae5529946535a5e80e4b8819a624.tar.gz re3-27653343666fae5529946535a5e80e4b8819a624.tar.bz2 re3-27653343666fae5529946535a5e80e4b8819a624.tar.lz re3-27653343666fae5529946535a5e80e4b8819a624.tar.xz re3-27653343666fae5529946535a5e80e4b8819a624.tar.zst re3-27653343666fae5529946535a5e80e4b8819a624.zip | |
Diffstat (limited to 'src/save')
| -rw-r--r-- | src/save/GenericGameStorage.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index 1e2d5da7..516c8d46 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -562,17 +562,23 @@ RestoreForStartLoad() ReadDataFromBufferPointer(_buf, TheCamera.GetMatrix().GetPosition().x); ReadDataFromBufferPointer(_buf, TheCamera.GetMatrix().GetPosition().y); ReadDataFromBufferPointer(_buf, TheCamera.GetMatrix().GetPosition().z); -#ifndef NO_ISLAND_LOADING - CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); - CStreaming::RemoveUnusedBuildings(CGame::currLevel); +#ifdef NO_ISLAND_LOADING + if (CMenuManager::m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_LOW) #endif + { + CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); + CStreaming::RemoveUnusedBuildings(CGame::currLevel); + } CCollision::SortOutCollisionAfterLoad(); -#ifndef NO_ISLAND_LOADING - CStreaming::RequestBigBuildings(CGame::currLevel); - CStreaming::LoadAllRequestedModels(false); - CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel); - CGame::TidyUpMemory(true, false); +#ifdef NO_ISLAND_LOADING + if (CMenuManager::m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_LOW) #endif + { + CStreaming::RequestBigBuildings(CGame::currLevel); + CStreaming::LoadAllRequestedModels(false); + CStreaming::HaveAllBigBuildingsLoaded(CGame::currLevel); + CGame::TidyUpMemory(true, false); + } if (CloseFile(file)) { return true; } else { |