From 934e9db4fc8b4bde193d95bf8f4cdf7b8d1ecd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Sat, 7 Mar 2020 22:22:43 +0300 Subject: CPopulation done, CCopPed and fixes --- src/peds/PlayerPed.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/peds/PlayerPed.cpp') diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 4aeae797..c6580d32 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -735,7 +735,7 @@ CPlayerPed::KeepAreaAroundPlayerClear(void) if (nearPed->m_objective == OBJECTIVE_NONE) { nearPed->SetFindPathAndFlee(this, 5000, true); } else { - if (nearPed->m_nPedState == PED_ENTER_CAR || nearPed->m_nPedState == PED_CARJACK) + if (nearPed->EnteringCar()) nearPed->QuitEnteringCar(); nearPed->ClearObjective(); @@ -750,7 +750,7 @@ CPlayerPed::KeepAreaAroundPlayerClear(void) CVector pos = GetPosition(); int16 lastVehicle; CEntity *vehicles[8]; - CWorld::FindObjectsInRange(pos, 15.0f, true, &lastVehicle, 6, vehicles, false, true, false, false, false); + CWorld::FindObjectsInRange(pos, CHECK_NEARBY_THINGS_MAX_DIST, true, &lastVehicle, 6, vehicles, false, true, false, false, false); for (int i = 0; i < lastVehicle; i++) { CVehicle *veh = (CVehicle*)vehicles[i]; @@ -1181,7 +1181,7 @@ CPlayerPed::ProcessControl(void) } if (m_nPedState == PED_DIE) { ClearWeaponTarget(); - if (CTimer::GetTimeInMilliseconds() > (uint32)m_bloodyFootprintCount + 4000) + if (CTimer::GetTimeInMilliseconds() > m_bloodyFootprintCountOrDeathTime + 4000) SetDead(); return; } -- cgit v1.2.3