summaryrefslogtreecommitdiffstats
path: root/src/weapons/Weapon.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-22 03:02:44 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-22 03:20:56 +0200
commitf3ed6659c32ec61c2c4c806707655e0c58123e4c (patch)
tree1d71dd86ef08d87e4ed703302224d330cecf4ae2 /src/weapons/Weapon.cpp
parentkilling peds increase chaos level (diff)
downloadre3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar
re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.gz
re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.bz2
re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.lz
re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.xz
re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.tar.zst
re3-f3ed6659c32ec61c2c4c806707655e0c58123e4c.zip
Diffstat (limited to 'src/weapons/Weapon.cpp')
-rw-r--r--src/weapons/Weapon.cpp8
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;