From f3ed6659c32ec61c2c4c806707655e0c58123e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Mon, 22 Jun 2020 04:02:44 +0300 Subject: CWanted, anim fix, ped objs renaming, remove III beta features --- src/weapons/Weapon.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/weapons') 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; -- cgit v1.2.3