From b44df26d3ea5fcdaf6d954016303f358d2c64b79 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 5 May 2020 13:02:42 +0200
Subject: implemented most of streamed collisions and big buildings

---
 src/peds/CivilianPed.cpp  | 2 ++
 src/peds/CopPed.cpp       | 4 +++-
 src/peds/EmergencyPed.cpp | 2 ++
 src/peds/Ped.cpp          | 2 ++
 src/peds/Population.cpp   | 2 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/peds')

diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 2dee0397..3c25d827 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -187,8 +187,10 @@ CCivilianPed::CivilianAI(void)
 void
 CCivilianPed::ProcessControl(void)
 {
+#ifndef MIAMI
 	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
+#endif
 
 	CPed::ProcessControl();
 
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index 8bfd807f..7140af76 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -565,8 +565,10 @@ CCopPed::CopAI(void)
 void
 CCopPed::ProcessControl(void)
 {
+#ifndef MIAMI
 	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
+#endif
 
 	CPed::ProcessControl();
 	if (bWasPostponed)
@@ -715,7 +717,7 @@ CCopPed::ProcessControl(void)
 		return;
 
 	bool dontShoot = false;
-	if (GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(this)) {
+	if (GetIsOnScreenAndNotCulled()) {
 		if (((CTimer::GetFrameCounter() + m_randomSeed) & 0x1F) == 17) {
 			CEntity *foundBuilding = nil;
 			CColPoint foundCol;
diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp
index 7229ed3f..e85cfc8b 100644
--- a/src/peds/EmergencyPed.cpp
+++ b/src/peds/EmergencyPed.cpp
@@ -44,8 +44,10 @@ CEmergencyPed::InRange(CPed *victim)
 void
 CEmergencyPed::ProcessControl(void)
 {
+#ifndef MIAMI
 	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
+#endif
 
 	CPed::ProcessControl();
 	if (bWasPostponed)
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index b1609094..6f584af2 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -9397,8 +9397,10 @@ CPed::ProcessControl(void)
 	CColPoint foundCol;
 	CEntity *foundEnt = nil;
 
+#ifndef MIAMI
 	if (m_nZoneLevel > LEVEL_NONE && m_nZoneLevel != CCollision::ms_collisionInMemory)
 		return;
+#endif
 
 	int alpha = CVisibilityPlugins::GetClumpAlpha(GetClump());
 	if (!bFadeOut) {
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 8dd9d23d..496d8999 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -858,6 +858,7 @@ CPopulation::AddPedInCar(CVehicle* car)
 void
 CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
 {
+#ifndef MIAMI
 	eLevelName level;
 	int zone;
 	int frame = CTimer::GetFrameCounter() & 7;
@@ -940,6 +941,7 @@ CPopulation::MoveCarsAndPedsOutOfAbandonedZones()
 			}
 		}
 	}
+#endif
 }
 
 void
-- 
cgit v1.2.3