5 files changed, 9 insertions, 9 deletions

diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 7c569257..2d782a73 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -232,7 +232,7 @@ CCivilianPed::CivilianAI(void)
 void
 CCivilianPed::ProcessControl(void)
 {
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
+	if (m_nZoneLevel > LEVEL_GENERIC && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
 
 	CPed::ProcessControl();
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index 99e8c1ae..6d106b0e 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -559,7 +559,7 @@ CCopPed::CopAI(void)
 void
 CCopPed::ProcessControl(void)
 {
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
+	if (m_nZoneLevel > LEVEL_GENERIC && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
 
 	CPed::ProcessControl();
diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp
index 083941b8..8d6999c3 100644
--- a/src/peds/EmergencyPed.cpp
+++ b/src/peds/EmergencyPed.cpp
@@ -44,7 +44,7 @@ CEmergencyPed::InRange(CPed *victim)
 void
 CEmergencyPed::ProcessControl(void)
 {
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
+	if (m_nZoneLevel > LEVEL_GENERIC && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
 
 	CPed::ProcessControl();
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 7a1bc3fc..92eb8b13 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -9177,7 +9177,7 @@ CPed::ProcessControl(void)
 	CColPoint foundCol;
 	CEntity *foundEnt = nil;
 
-	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
+	if (m_nZoneLevel > LEVEL_GENERIC && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
 
 	int alpha = CVisibilityPlugins::GetClumpAlpha(GetClump());
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index e2257a28..1357907d 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -394,7 +394,7 @@ CPopulation::FindCollisionZoneForCoors(CVector *coors, int *safeZoneOut, eLevelN
 	}
 	// Then it's transition area
 	if (*safeZoneOut >= 0)
-		*levelOut = LEVEL_NONE;
+		*levelOut = LEVEL_GENERIC;
 	else
 		*levelOut = CTheZones::GetLevelFromPosition(coors);
 }
@@ -867,7 +867,7 @@ CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
 		for (int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
 
 			CVehicle* veh = CPools::GetVehiclePool()->GetSlot(poolIndex);
-			if (veh && veh->m_nZoneLevel == LEVEL_NONE && veh->IsCar()) {
+			if (veh && veh->m_nZoneLevel == LEVEL_GENERIC && veh->IsCar()) {
 
 				if(veh->GetStatus() != STATUS_ABANDONED && veh->GetStatus() != STATUS_WRECKED && veh->GetStatus() != STATUS_PLAYER &&
 					veh->GetStatus() != STATUS_PLAYER_REMOTE) {
@@ -876,7 +876,7 @@ CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
 					CPopulation::FindCollisionZoneForCoors(&vehPos, &zone, &level);
 
 					// Level 0 is transition zones, and we don't wanna touch cars on transition zones.
-					if (level != LEVEL_NONE && level != CCollision::ms_collisionInMemory && vehPos.z > -4.0f) {
+					if (level != LEVEL_GENERIC && level != CCollision::ms_collisionInMemory && vehPos.z > -4.0f) {
 						if (veh->bIsLocked || !veh->CanBeDeleted()) {
 							switch (movedVehicleCount & 3) {
 								case 0:
@@ -913,13 +913,13 @@ CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
 		for (int poolIndex = poolSize - 1; poolIndex >= 0; poolIndex--) {
 
 			CPed *ped = CPools::GetPedPool()->GetSlot(poolIndex);
-			if (ped && ped->m_nZoneLevel == LEVEL_NONE && !ped->bInVehicle) {
+			if (ped && ped->m_nZoneLevel == LEVEL_GENERIC && !ped->bInVehicle) {
 
 				CVector pedPos(ped->GetPosition());
 				CPopulation::FindCollisionZoneForCoors(&pedPos, &zone, &level);
 
 				// Level 0 is transition zones, and we don't wanna touch peds on transition zones.
-				if (level != LEVEL_NONE && level != CCollision::ms_collisionInMemory && pedPos.z > -4.0f) {
+				if (level != LEVEL_GENERIC && level != CCollision::ms_collisionInMemory && pedPos.z > -4.0f) {
 					if (ped->CanBeDeleted()) {
 						CWorld::Remove(ped);
 						delete ped;