diff options
author | eray orçunus <erayorcunus@gmail.com> | 2020-09-01 20:10:35 +0200 |
---|---|---|
committer | eray orçunus <erayorcunus@gmail.com> | 2020-09-01 20:10:35 +0200 |
commit | 16e10d788a12b12300c2232eeb5513b6df5233b5 (patch) | |
tree | b98206f10d38401b3124e9d1249f8feb33307ade /src/peds | |
parent | Merge pull request #700 from Sergeanur/VC/Stinger (diff) | |
download | re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.gz re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.bz2 re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.lz re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.xz re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.zst re3-16e10d788a12b12300c2232eeb5513b6df5233b5.zip |
Diffstat (limited to '')
-rw-r--r-- | src/peds/CopPed.cpp | 42 | ||||
-rw-r--r-- | src/peds/CopPed.h | 1 |
2 files changed, 37 insertions, 6 deletions
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp index 8dd517a2..9160319b 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -95,7 +95,7 @@ CCopPed::CCopPed(eCopType copType, int32 modifier) : CPed(PEDTYPE_COP) field_624 = 0; m_pStinger = new CStinger; if (m_pPointGunAt) - m_pPointGunAt->CleanUpOldReference((CEntity**)&m_pPointGunAt); + m_pPointGunAt->CleanUpOldReference(&m_pPointGunAt); m_pPointGunAt = nil; } @@ -601,7 +601,7 @@ CCopPed::CopAI(void) } } -// --MIAMI: Done except commented things +// --MIAMI: Done void CCopPed::ProcessControl(void) { @@ -611,15 +611,13 @@ CCopPed::ProcessControl(void) CPed::ProcessControl(); if (m_bThrowsSpikeTrap) { - // TODO(Miami) - /* if (CGame::currArea != AREA_MALL) ProcessStingerCop(); - */ return; } - // TODO(Miami): CStinger::Process + if (m_pStinger && m_pStinger->bIsDeployed && m_pStinger->m_nSpikeState == STINGERSTATE_DEPLOYED && CGame::currArea != AREA_MALL) + m_pStinger->Process(); if (bWasPostponed) return; @@ -858,4 +856,36 @@ CCopPed::ProcessHeliSwat(void) SetInTheAir(); bKnockedUpIntoAir = true; } +} + +// --MIAMI: Done +void +CCopPed::ProcessStingerCop(void) +{ + if (m_pStinger->bIsDeployed || FindPlayerVehicle() && (FindPlayerVehicle()->IsCar() || FindPlayerVehicle()->IsBike())) { + if (m_pStinger->bIsDeployed) { + m_pStinger->Process(); + } else { + CVector2D vehDist = GetPosition() - FindPlayerVehicle()->GetPosition(); + CVector2D dirVehGoing = FindPlayerVehicle()->m_vecMoveSpeed; + if (vehDist.MagnitudeSqr() < sq(30.0f)) { + if (dirVehGoing.MagnitudeSqr() > 0.0f) { + vehDist.Normalise(); + dirVehGoing.Normalise(); + if (DotProduct2D(vehDist, dirVehGoing) > 0.8f) { + float angle = (CrossProduct2D(vehDist, dirVehGoing - vehDist) < 0.0f ? + FindPlayerVehicle()->GetForward().Heading() - HALFPI : + HALFPI + FindPlayerVehicle()->GetForward().Heading()); + + SetHeading(angle); + m_fRotationCur = angle; + m_fRotationDest = angle; + m_pStinger->Deploy(this); + } + } + } + } + } else { + ClearPursuit(); + } }
\ No newline at end of file diff --git a/src/peds/CopPed.h b/src/peds/CopPed.h index 35244bed..190d619e 100644 --- a/src/peds/CopPed.h +++ b/src/peds/CopPed.h @@ -45,6 +45,7 @@ public: void ScanForCrimes(void); void CopAI(void); void ProcessHeliSwat(void); + void ProcessStingerCop(void); }; #ifndef PED_SKIN |