diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:43 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:43 +0200 |
| commit | c2b9ddc5b8935dcd8de593c918f50886e0400319 (patch) | |
| tree | 99f4d7dec983e7ad6f4071cc259c8c0de2eda2e2 /src/peds | |
| parent | Remove Miami stuff (diff) | |
| download | re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.gz re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.bz2 re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.lz re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.xz re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.tar.zst re3-c2b9ddc5b8935dcd8de593c918f50886e0400319.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/CivilianPed.cpp | 2 | ||||
| -rw-r--r-- | src/peds/CopPed.cpp | 8 | ||||
| -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, 16 insertions, 0 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 72c89df2..7140af76 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -425,8 +425,14 @@ CCopPed::CopAI(void) #ifdef VC_PED_PORTS float dotProd; if (m_nRoadblockNode != -1) { +#ifndef MIAMI CTreadable *roadBlockRoad = ThePaths.m_mapObjects[CRoadBlocks::RoadBlockObjects[m_nRoadblockNode]]; dotProd = DotProduct2D(playerOrHisVeh->GetPosition() - roadBlockRoad->GetPosition(), GetPosition() - roadBlockRoad->GetPosition()); +#else + // TODO: check this, i'm only getting this compile here.... + CPathNode *roadBlockNode = &ThePaths.m_pathNodes[CRoadBlocks::RoadBlockNodes[m_nRoadblockNode]]; + dotProd = DotProduct2D(playerOrHisVeh->GetPosition() - roadBlockNode->GetPosition(), GetPosition() - roadBlockNode->GetPosition()); +#endif } else dotProd = -1.0f; @@ -559,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) 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 56a18dab..04b62e46 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 ce781983..fed607ed 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 |