diff options
| author | aap <aap@papnet.eu> | 2020-05-05 13:02:42 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 13:02:42 +0200 |
| commit | b44df26d3ea5fcdaf6d954016303f358d2c64b79 (patch) | |
| tree | 2921c2c0e2883117f4ce9cec73865c1701f32cec /src/peds | |
| parent | SetPosition, final part (diff) | |
| download | re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.gz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.bz2 re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.lz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.xz re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.tar.zst re3-b44df26d3ea5fcdaf6d954016303f358d2c64b79.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/CivilianPed.cpp | 2 | ||||
| -rw-r--r-- | src/peds/CopPed.cpp | 4 | ||||
| -rw-r--r-- | src/peds/EmergencyPed.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 2 |
5 files changed, 11 insertions, 1 deletions
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 |