Rename LEVEL_NONE to LEVEL_GENERIC

5 files changed, 19 insertions, 19 deletions

diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index 04983e30..47b4586b 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -121,8 +121,8 @@ CGameLogic::Update()
 			CCarCtrl::ClearInterestingVehicleList();
 			CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
 			CRestart::FindClosestHospitalRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
-			CRestart::OverrideHospitalLevel = LEVEL_NONE;
-			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
+			CRestart::OverrideHospitalLevel = LEVEL_GENERIC;
+			CRestart::OverridePoliceStationLevel = LEVEL_GENERIC;
 			PassTime(720);
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
 			SortOutStreamingAndMemory(pPlayerInfo.GetPos());
@@ -200,8 +200,8 @@ CGameLogic::Update()
 			CCarCtrl::ClearInterestingVehicleList();
 			CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
 			CRestart::FindClosestPoliceRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
-			CRestart::OverrideHospitalLevel = LEVEL_NONE;
-			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
+			CRestart::OverrideHospitalLevel = LEVEL_GENERIC;
+			CRestart::OverridePoliceStationLevel = LEVEL_GENERIC;
 			PassTime(720);
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
 			pPlayerInfo.m_pPed->ClearWeapons();
@@ -249,8 +249,8 @@ CGameLogic::Update()
 			CCarCtrl::ClearInterestingVehicleList();
 			CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
 			CRestart::FindClosestPoliceRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
-			CRestart::OverridePoliceStationLevel = LEVEL_NONE;
-			CRestart::OverrideHospitalLevel = LEVEL_NONE;
+			CRestart::OverridePoliceStationLevel = LEVEL_GENERIC;
+			CRestart::OverrideHospitalLevel = LEVEL_GENERIC;
 			RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
 			SortOutStreamingAndMemory(pPlayerInfo.GetPos());
 			TheCamera.m_fCamShakeForce = 0.0f;
diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index d086543f..30bca2f3 100644
--- a/src/control/Record.cpp
+++ b/src/control/Record.cpp
@@ -426,8 +426,8 @@ void RemoveUnusedCollision(void)
 		"com_rvroads52", "com_roadsrv", "com_roadkb23", "com_roadkb22"
 	};
 	for (int i = 0; i < ARRAY_SIZE(dontDeleteArray); i++)
-		CModelInfo::GetModelInfo(dontDeleteArray[i], nil)->GetColModel()->level = LEVEL_NONE;
-	CModelInfo::RemoveColModelsFromOtherLevels(LEVEL_NONE);
+		CModelInfo::GetModelInfo(dontDeleteArray[i], nil)->GetColModel()->level = LEVEL_GENERIC;
+	CModelInfo::RemoveColModelsFromOtherLevels(LEVEL_GENERIC);
 	for (int i = 0; i < ARRAY_SIZE(dontDeleteArray); i++)
 		CModelInfo::GetModelInfo(dontDeleteArray[i], nil)->GetColModel()->level = LEVEL_COMMERCIAL;
 }
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 707f1d87..cb9df508 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -164,7 +164,7 @@ static void ApplyPanelDamageToCar(uint32 panels, CAutomobile* vehicle, bool flyi
 
 void PrintElementsInPtrList(void) 
 {
-	for (CPtrNode* node = CWorld::GetBigBuildingList(LEVEL_NONE).first; node; node = node->next) {
+	for (CPtrNode* node = CWorld::GetBigBuildingList(LEVEL_GENERIC).first; node; node = node->next) {
 		/* Most likely debug print was present here */
 	}
 }
@@ -1124,7 +1124,7 @@ void CReplay::StoreStuffInMem(void)
 	pWorld1 = new uint8[sizeof(CSector) * NUMSECTORS_X * NUMSECTORS_Y];
 	memcpy(pWorld1, CWorld::GetSector(0, 0), NUMSECTORS_X * NUMSECTORS_Y * sizeof(CSector));
 	WorldPtrList = CWorld::GetMovingEntityList().first; // why
-	BigBuildingPtrList = CWorld::GetBigBuildingList(LEVEL_NONE).first;
+	BigBuildingPtrList = CWorld::GetBigBuildingList(LEVEL_GENERIC).first;
 	pPickups = new uint8[sizeof(CPickup) * NUMPICKUPS];
 	memcpy(pPickups, CPickups::aPickUps, NUMPICKUPS * sizeof(CPickup));
 	pReferences = new uint8[(sizeof(CReference) * NUMREFERENCES)];
@@ -1170,7 +1170,7 @@ void CReplay::RestoreStuffFromMem(void)
 	delete[] pWorld1;
 	pWorld1 = nil;
 	CWorld::GetMovingEntityList().first = WorldPtrList;
-	CWorld::GetBigBuildingList(LEVEL_NONE).first = BigBuildingPtrList;
+	CWorld::GetBigBuildingList(LEVEL_GENERIC).first = BigBuildingPtrList;
 	memcpy(CPickups::aPickUps, pPickups, sizeof(CPickup) * NUMPICKUPS);
 	delete[] pPickups;
 	pPickups = nil;
diff --git a/src/control/Restart.cpp b/src/control/Restart.cpp
index 5a322cdb..a6482d04 100644
--- a/src/control/Restart.cpp
+++ b/src/control/Restart.cpp
@@ -24,8 +24,8 @@ uint16 CRestart::NumberOfPoliceRestarts;
 void
 CRestart::Initialise()
 {
-	OverridePoliceStationLevel = LEVEL_NONE;
-	OverrideHospitalLevel = LEVEL_NONE;
+	OverridePoliceStationLevel = LEVEL_GENERIC;
+	OverrideHospitalLevel = LEVEL_GENERIC;
 	bFadeInAfterNextArrest = true;
 	bFadeInAfterNextDeath = true;
 	OverrideHeading = 0.0f;
@@ -86,7 +86,7 @@ CRestart::FindClosestHospitalRestartPoint(const CVector &pos, CVector *outPos, f
 
 	// find closest point on this level
 	for (int i = 0; i < NumberOfHospitalRestarts; i++) {
-		if (CTheZones::FindZoneForPoint(HospitalRestartPoints[i]) == (OverrideHospitalLevel != LEVEL_NONE ? OverrideHospitalLevel : curlevel)) {
+		if (CTheZones::FindZoneForPoint(HospitalRestartPoints[i]) == (OverrideHospitalLevel != LEVEL_GENERIC ? OverrideHospitalLevel : curlevel)) {
 			float dist = (pos - HospitalRestartPoints[i]).MagnitudeSqr();
 			if (fMinDist >= dist) {
 				fMinDist = dist;
@@ -133,7 +133,7 @@ CRestart::FindClosestPoliceRestartPoint(const CVector &pos, CVector *outPos, flo
 
 	// find closest point on this level
 	for (int i = 0; i < NumberOfPoliceRestarts; i++) {
-		if (CTheZones::FindZoneForPoint(PoliceRestartPoints[i]) == (OverridePoliceStationLevel != LEVEL_NONE ? OverridePoliceStationLevel : curlevel)) {
+		if (CTheZones::FindZoneForPoint(PoliceRestartPoints[i]) == (OverridePoliceStationLevel != LEVEL_GENERIC ? OverridePoliceStationLevel : curlevel)) {
 			float dist = (pos - PoliceRestartPoints[i]).MagnitudeSqr();
 			if (fMinDist >= dist) {
 				fMinDist = dist;
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 3309dbd2..1f25f00c 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -8708,7 +8708,7 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
 		CEntity* apEntities[16];
 		CWorld::FindObjectsOfTypeInRange(mi, pos, range, true, &total, 16, apEntities, true, false, false, true, true);
 		if (total == 0)
-			CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(LEVEL_NONE), pos, range, true, &total, 16, apEntities);
+			CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(LEVEL_GENERIC), pos, range, true, &total, 16, apEntities);
 		if (total == 0)
 			CWorld::FindObjectsOfTypeInRangeSectorList(mi, CWorld::GetBigBuildingList(CTheZones::FindZoneForPoint(pos)), pos, range, true, &total, 16, apEntities);
 		CEntity* pClosestEntity = nil;
@@ -9460,7 +9460,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		CEntity* apEntities[16];
 		CWorld::FindObjectsOfTypeInRange(mi1, pos, radius, true, &total, 16, apEntities, true, false, false, false, false);
 		if (total == 0)
-			CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(LEVEL_NONE), pos, radius, true, &total, 16, apEntities);
+			CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(LEVEL_GENERIC), pos, radius, true, &total, 16, apEntities);
 		if (total == 0)
 			CWorld::FindObjectsOfTypeInRangeSectorList(mi1, CWorld::GetBigBuildingList(CTheZones::FindZoneForPoint(pos)), pos, radius, true, &total, 16, apEntities);
 		CEntity* pClosestEntity = nil;
@@ -10062,7 +10062,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		if (ScriptParams[1])
 			pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pVehicle->GetPosition());
 		else
-			pVehicle->m_nZoneLevel = LEVEL_NONE;
+			pVehicle->m_nZoneLevel = LEVEL_GENERIC;
 		return 0;
 	}
 	case COMMAND_SET_CHAR_STAYS_IN_CURRENT_LEVEL:
@@ -10073,7 +10073,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		if (ScriptParams[1])
 			pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(&pPed->GetPosition());
 		else
-			pPed->m_nZoneLevel = LEVEL_NONE;
+			pPed->m_nZoneLevel = LEVEL_GENERIC;
 		return 0;
 	}
 	case COMMAND_REGISTER_4X4_ONE_TIME: