diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-12-27 17:26:30 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-12-27 17:26:30 +0100 |
| commit | 7959b7fd1fa0b4dbe46485c111277eae3c374dde (patch) | |
| tree | 43a023dcca34b29132f856615973812e3b197fb2 /src/core/MenuScreensCustom.cpp | |
| parent | switch vehicle pipe default (diff) | |
| download | re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.tar re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.tar.gz re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.tar.bz2 re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.tar.lz re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.tar.xz re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.tar.zst re3-7959b7fd1fa0b4dbe46485c111277eae3c374dde.zip | |
Diffstat (limited to 'src/core/MenuScreensCustom.cpp')
| -rw-r--r-- | src/core/MenuScreensCustom.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp index e35a7751..2001b20b 100644 --- a/src/core/MenuScreensCustom.cpp +++ b/src/core/MenuScreensCustom.cpp @@ -100,12 +100,10 @@ void RestoreDefGraphics(int8 action) { #ifdef NO_ISLAND_LOADING if (!FrontEndMenuManager.m_bGameNotLoaded) { FrontEndMenuManager.m_PrefsIslandLoading = FrontEndMenuManager.ISLAND_LOADING_LOW; - CCollision::bAlreadyLoaded = false; - CModelInfo::RemoveColModelsFromOtherLevels(CGame::currLevel); - CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); - CStreaming::RemoveUnusedBuildings(CGame::currLevel); - CStreaming::RequestIslands(CGame::currLevel); - CStreaming::LoadAllRequestedModels(true); + CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); + CStreaming::RemoveUnusedBuildings(CGame::currLevel); + CStreaming::RequestIslands(CGame::currLevel); + CStreaming::LoadAllRequestedModels(true); } else FrontEndMenuManager.m_PrefsIslandLoading = FrontEndMenuManager.ISLAND_LOADING_LOW; #endif @@ -151,16 +149,11 @@ void IslandLoadingAfterChange(int8 before, int8 after) { if (after > FrontEndMenuManager.ISLAND_LOADING_LOW) { FrontEndMenuManager.m_PrefsIslandLoading = before; // calls below needs previous mode :shrug: - if (after == FrontEndMenuManager.ISLAND_LOADING_HIGH) - CStreaming::RemoveIslandsNotUsed(LEVEL_GENERIC); + if (after == FrontEndMenuManager.ISLAND_LOADING_HIGH) { + CStreaming::RemoveIslandsNotUsed(LEVEL_BEACH); + CStreaming::RemoveIslandsNotUsed(LEVEL_MAINLAND); + } if (before == FrontEndMenuManager.ISLAND_LOADING_LOW) { - if (CGame::currLevel != LEVEL_INDUSTRIAL) - CFileLoader::LoadCollisionFromDatFile(LEVEL_INDUSTRIAL); - if (CGame::currLevel != LEVEL_COMMERCIAL) - CFileLoader::LoadCollisionFromDatFile(LEVEL_COMMERCIAL); - if (CGame::currLevel != LEVEL_SUBURBAN) - CFileLoader::LoadCollisionFromDatFile(LEVEL_SUBURBAN); - CCollision::bAlreadyLoaded = true; FrontEndMenuManager.m_PrefsIslandLoading = after; CStreaming::RequestBigBuildings(CGame::currLevel); @@ -171,8 +164,6 @@ void IslandLoadingAfterChange(int8 before, int8 after) { FrontEndMenuManager.m_PrefsIslandLoading = after; } else { // low - CCollision::bAlreadyLoaded = false; - CModelInfo::RemoveColModelsFromOtherLevels(CGame::currLevel); CStreaming::RemoveUnusedBigBuildings(CGame::currLevel); CStreaming::RemoveUnusedBuildings(CGame::currLevel); CStreaming::RequestIslands(CGame::currLevel); |