Island loading and PS2 alpha test added to options

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