diff options
| author | aap <aap@papnet.eu> | 2020-05-05 18:06:38 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-05 18:06:38 +0200 |
| commit | e81652c2fc2787fc8aab3937be62127e7a3354ee (patch) | |
| tree | c36897c90f4f37796ec955c49e70e99944de7dda /src/peds/CopPed.cpp | |
| parent | Merge pull request #514 from Nick007J/miami (diff) | |
| download | re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.gz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.bz2 re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.lz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.xz re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.tar.zst re3-e81652c2fc2787fc8aab3937be62127e7a3354ee.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/CopPed.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp index 7140af76..0c78279e 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -425,14 +425,9 @@ 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.... + // TODO(MIAMI): 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,11 +560,6 @@ 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) return; @@ -717,7 +707,7 @@ CCopPed::ProcessControl(void) return; bool dontShoot = false; - if (GetIsOnScreenAndNotCulled()) { + if (GetIsOnScreen()) { if (((CTimer::GetFrameCounter() + m_randomSeed) & 0x1F) == 17) { CEntity *foundBuilding = nil; CColPoint foundCol; |