summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-04-12 17:39:23 +0200
committerGitHub <noreply@github.com>2020-04-12 17:39:23 +0200
commit0caceec1de7c0bedfb53f329322239538a5a67de (patch)
tree5358c9cb855bd681a3f73e9bbbec383c5de90554 /src/peds
parentRemove CObject from readme (diff)
parentPed fix (diff)
downloadre3-0caceec1de7c0bedfb53f329322239538a5a67de.tar
re3-0caceec1de7c0bedfb53f329322239538a5a67de.tar.gz
re3-0caceec1de7c0bedfb53f329322239538a5a67de.tar.bz2
re3-0caceec1de7c0bedfb53f329322239538a5a67de.tar.lz
re3-0caceec1de7c0bedfb53f329322239538a5a67de.tar.xz
re3-0caceec1de7c0bedfb53f329322239538a5a67de.tar.zst
re3-0caceec1de7c0bedfb53f329322239538a5a67de.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Ped.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 687c9906..83d335aa 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -2724,7 +2724,10 @@ CPed::SetObjective(eObjective newObj, void *entity)
break;
}
} else {
- if ((newObj == OBJECTIVE_LEAVE_VEHICLE
+ if ((newObj == OBJECTIVE_WAIT_IN_CAR_THEN_GETOUT || newObj == OBJECTIVE_KILL_CHAR_ON_FOOT ||
+ newObj == OBJECTIVE_KILL_CHAR_ANY_MEANS || newObj == OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE ||
+ newObj == OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS || newObj == OBJECTIVE_GOTO_CHAR_ON_FOOT ||
+ newObj == OBJECTIVE_FOLLOW_PED_IN_FORMATION || newObj == OBJECTIVE_LEAVE_VEHICLE
#ifdef VC_PED_PORTS
|| newObj == OBJECTIVE_LEAVE_CAR_AND_DIE
#endif
@@ -2733,7 +2736,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
}
#ifdef VC_PED_PORTS
- SetObjectiveTimer(0);
ClearPointGunAt();
#endif
bObjectiveCompleted = false;