diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-05 17:04:18 +0200 |
| commit | 9960c411933f9a804eb5f6840d75ad00fd255252 (patch) | |
| tree | 19886c3263958d5c77664518270d252ad5554602 /src/peds | |
| parent | Merge pull request #512 from Nick007J/master (diff) | |
| download | re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.gz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.bz2 re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.lz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.xz re3-9960c411933f9a804eb5f6840d75ad00fd255252.tar.zst re3-9960c411933f9a804eb5f6840d75ad00fd255252.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, 0 insertions, 16 deletions
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp index 3c25d827..2dee0397 100644 --- a/src/peds/CivilianPed.cpp +++ b/src/peds/CivilianPed.cpp @@ -187,10 +187,8 @@ 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 7140af76..72c89df2 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -425,14 +425,8 @@ 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; @@ -565,10 +559,8 @@ 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 e85cfc8b..7229ed3f 100644 --- a/src/peds/EmergencyPed.cpp +++ b/src/peds/EmergencyPed.cpp @@ -44,10 +44,8 @@ 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 04b62e46..56a18dab 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -9397,10 +9397,8 @@ 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 fed607ed..ce781983 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -858,7 +858,6 @@ CPopulation::AddPedInCar(CVehicle* car) void CPopulation::MoveCarsAndPedsOutOfAbandonedZones() { -#ifndef MIAMI eLevelName level; int zone; int frame = CTimer::GetFrameCounter() & 7; @@ -941,7 +940,6 @@ CPopulation::MoveCarsAndPedsOutOfAbandonedZones() } } } -#endif } void |