summaryrefslogtreecommitdiffstats
path: root/src/control/RoadBlocks.cpp
diff options
context:
space:
mode:
authormajestic <majesticcoding@gmail.com>2020-09-30 12:13:32 +0200
committermajestic <majesticcoding@gmail.com>2020-09-30 12:13:32 +0200
commitd4efd003bc614f20074dd4daf96a2a223ff51bea (patch)
treecde4b80f479c84fe4a164fe3daef1309785f17be /src/control/RoadBlocks.cpp
parentExperiment (diff)
parentMerge remote-tracking branch 'origin/master' into miami (diff)
downloadre3-d4efd003bc614f20074dd4daf96a2a223ff51bea.tar
re3-d4efd003bc614f20074dd4daf96a2a223ff51bea.tar.gz
re3-d4efd003bc614f20074dd4daf96a2a223ff51bea.tar.bz2
re3-d4efd003bc614f20074dd4daf96a2a223ff51bea.tar.lz
re3-d4efd003bc614f20074dd4daf96a2a223ff51bea.tar.xz
re3-d4efd003bc614f20074dd4daf96a2a223ff51bea.tar.zst
re3-d4efd003bc614f20074dd4daf96a2a223ff51bea.zip
Diffstat (limited to 'src/control/RoadBlocks.cpp')
-rw-r--r--src/control/RoadBlocks.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp
index e8630bde..e7831b82 100644
--- a/src/control/RoadBlocks.cpp
+++ b/src/control/RoadBlocks.cpp
@@ -92,10 +92,16 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType
pCopPed->SetIdle();
pCopPed->bKindaStayInSamePlace = true;
pCopPed->bNotAllowedToDuck = false;
- pCopPed->bCrouchWhenShooting = roadBlockType != 2;
+ pCopPed->m_nExtendedRangeTimer = CTimer::GetTimeInMilliseconds() + 10000;
+ pCopPed->m_nRoadblockVeh = pVehicle;
+ pCopPed->m_nRoadblockVeh->RegisterReference((CEntity**)&pCopPed->m_nRoadblockVeh);
+ pCopPed->bCrouchWhenShooting = roadBlockType == 2 ? false : true;
if (pEntityToAttack) {
+ if (pCopPed->m_pPointGunAt)
+ pCopPed->m_pPointGunAt->CleanUpOldReference(&pCopPed->m_pPointGunAt);
pCopPed->m_pPointGunAt = pEntityToAttack;
- pEntityToAttack->RegisterReference(&pCopPed->m_pPointGunAt);
+ if (pEntityToAttack)
+ pEntityToAttack->RegisterReference(&pCopPed->m_pPointGunAt);
pCopPed->SetAttack(pEntityToAttack);
}
pCopPed->m_pMyVehicle = pVehicle;