diff options
| author | aap <aap@papnet.eu> | 2020-06-25 15:15:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 15:15:01 +0200 |
| commit | 592a6aef0bb336f1364e6bf38230f3793ec35c4d (patch) | |
| tree | 3b8df6abb470acc7b9b55d0e8476e1478ba626c0 /src/weapons/Weapon.cpp | |
| parent | rename attractor flag to type (diff) | |
| parent | CWanted, anim fix, ped objs renaming, remove III beta features (diff) | |
| download | re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.gz re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.bz2 re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.lz re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.xz re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.tar.zst re3-592a6aef0bb336f1364e6bf38230f3793ec35c4d.zip | |
Diffstat (limited to 'src/weapons/Weapon.cpp')
| -rw-r--r-- | src/weapons/Weapon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index a895315e..8e7e4265 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -740,7 +740,7 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource) { if (driver->m_pedStats->m_temper <= driver->m_pedStats->m_fear) { - driver->SetObjective(OBJECTIVE_FLEE_TILL_SAFE); + driver->SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE); } else { @@ -756,7 +756,7 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource) CPed *passenger = nearCar->pPassengers[j]; if (passenger && passenger->CharCreatedBy != MISSION_CHAR) { - nearCar->pPassengers[j]->SetObjective(OBJECTIVE_FLEE_TILL_SAFE); + nearCar->pPassengers[j]->SetObjective(OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE); passenger->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + leaveCarDelay; leaveCarDelay += 200; } @@ -767,8 +767,8 @@ CWeapon::FireMelee(CEntity *shooter, CVector &fireSource) CPed *driver = nearCar->pDriver; if (driver) { - if (driver->m_objective != OBJECTIVE_LEAVE_VEHICLE && driver->m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT && - driver->m_objective != OBJECTIVE_FLEE_TILL_SAFE) + if (driver->m_objective != OBJECTIVE_LEAVE_CAR && driver->m_objective != OBJECTIVE_KILL_CHAR_ON_FOOT && + driver->m_objective != OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE) { if (nearCar->AutoPilot.m_nDrivingStyle != DRIVINGSTYLE_PLOUGH_THROUGH) nearCar->AutoPilot.m_nCruiseSpeed = nearCar->AutoPilot.m_nCruiseSpeed * 1.5f; |