diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-09-30 14:19:37 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-09-30 14:19:37 +0200 |
| commit | 60681884533b79a08ed5574a257df7707d858a4d (patch) | |
| tree | 76fd83d4b13d5d7c743acc57801b7b8e4fc4a795 /src/peds/Ped.cpp | |
| parent | now fixed properly (diff) | |
| parent | Merge pull request #721 from theR4K/miamiUpstream (diff) | |
| download | re3-60681884533b79a08ed5574a257df7707d858a4d.tar re3-60681884533b79a08ed5574a257df7707d858a4d.tar.gz re3-60681884533b79a08ed5574a257df7707d858a4d.tar.bz2 re3-60681884533b79a08ed5574a257df7707d858a4d.tar.lz re3-60681884533b79a08ed5574a257df7707d858a4d.tar.xz re3-60681884533b79a08ed5574a257df7707d858a4d.tar.zst re3-60681884533b79a08ed5574a257df7707d858a4d.zip | |
Diffstat (limited to 'src/peds/Ped.cpp')
| -rw-r--r-- | src/peds/Ped.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 6b704b37..a7c82f0a 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -67,6 +67,8 @@ #include "CutsceneShadow.h" #include "Clock.h" +// --MIAMI: file done except TODOs + #define CAN_SEE_ENTITY_ANGLE_THRESHOLD DEGTORAD(60.0f) CPed *gapTempPedList[50]; @@ -10945,7 +10947,7 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg) pedToDragOut->RegisterThreatWithGangPeds(ped); if (ped->m_nPedType == PEDTYPE_COP && pedToDragOut == FindPlayerPed() && veh->IsBike()) - ((CCopPed*)ped)->field_601 = 1; + ((CCopPed*)ped)->m_bDragsPlayerFromCar = 1; if (pedToDragOut == veh->pDriver) { if (veh->pPassengers[0]) @@ -20894,11 +20896,11 @@ CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWith } if (m_nPedType == PEDTYPE_COP && m_pedInObjective->IsPlayer()) { float maxArrestDist = 1.5f; - if (((CCopPed*)this)->field_601) { + if (((CCopPed*)this)->m_bDragsPlayerFromCar) { if (m_nPedState == PED_FALL) { maxArrestDist = 3.5f; } else if (m_nPedState != PED_DRAG_FROM_CAR) { - ((CCopPed*)this)->field_601 = 0; + ((CCopPed*)this)->m_bDragsPlayerFromCar = 0; } } @@ -21139,11 +21141,11 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith } if (m_nPedType == PEDTYPE_COP && m_pedInObjective->IsPlayer()) { float maxArrestDist = 1.5f; - if (((CCopPed*)this)->field_601) { + if (((CCopPed*)this)->m_bDragsPlayerFromCar) { if (m_nPedState == PED_FALL) { maxArrestDist = 3.5f; } else if (m_nPedState != PED_DRAG_FROM_CAR) { - ((CCopPed*)this)->field_601 = 0; + ((CCopPed*)this)->m_bDragsPlayerFromCar = 0; } } |