diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-15 16:47:36 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-15 16:47:36 +0100 |
| commit | 1971b3db62c5eec1bc6400fe85455eb9596f18b9 (patch) | |
| tree | 1912abb1478fcfc1db697e3bb9b172f1119c3f56 /src/peds/PlayerPed.cpp | |
| parent | replay bug fixes, script bug fix (diff) | |
| parent | Merge pull request #344 from erorcun/erorcun (diff) | |
| download | re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.tar re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.tar.gz re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.tar.bz2 re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.tar.lz re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.tar.xz re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.tar.zst re3-1971b3db62c5eec1bc6400fe85455eb9596f18b9.zip | |
Diffstat (limited to 'src/peds/PlayerPed.cpp')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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;
}
|