summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-18 11:09:50 +0200
committeraap <aap@papnet.eu>2020-08-18 11:09:50 +0200
commite3405f4be4369c98f874a2d477bd6567f1be9381 (patch)
tree1cdaa079fcb6a6da55d6d5126594b2a1a94bf76d /src/modelinfo
parentupdate librw (diff)
parentremove CFO (diff)
downloadre3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.gz
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.bz2
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.lz
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.xz
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.tar.zst
re3-e3405f4be4369c98f874a2d477bd6567f1be9381.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/ModelInfo.cpp28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp
index d6fb0102..5d9c7700 100644
--- a/src/modelinfo/ModelInfo.cpp
+++ b/src/modelinfo/ModelInfo.cpp
@@ -4,6 +4,7 @@
#include "TempColModels.h"
#include "ModelIndices.h"
#include "ModelInfo.h"
+#include "Frontend.h"
CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
@@ -217,20 +218,23 @@ CModelInfo::IsBikeModel(int32 id)
void
CModelInfo::RemoveColModelsFromOtherLevels(eLevelName level)
{
-#ifndef NO_ISLAND_LOADING
- int i;
- CBaseModelInfo *mi;
- CColModel *colmodel;
-
- for(i = 0; i < MODELINFOSIZE; i++){
- mi = GetModelInfo(i);
- if(mi){
- colmodel = mi->GetColModel();
- if(colmodel && colmodel->level != LEVEL_GENERIC && colmodel->level != level)
- colmodel->RemoveCollisionVolumes();
+#ifdef NO_ISLAND_LOADING
+ if (CMenuManager::m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_LOW)
+#endif
+ {
+ int i;
+ CBaseModelInfo *mi;
+ CColModel *colmodel;
+
+ for (i = 0; i < MODELINFOSIZE; i++) {
+ mi = GetModelInfo(i);
+ if (mi) {
+ colmodel = mi->GetColModel();
+ if (colmodel && colmodel->level != LEVEL_GENERIC && colmodel->level != level)
+ colmodel->RemoveCollisionVolumes();
+ }
}
}
-#endif
}
void