diff options
author | eray orçunus <erayorcunus@gmail.com> | 2020-04-12 17:37:59 +0200 |
---|---|---|
committer | eray orçunus <erayorcunus@gmail.com> | 2020-04-12 17:37:59 +0200 |
commit | 8476283174411e80b5129611763f1beb868edffc (patch) | |
tree | 7b60e9d42cb7639ddc1fcf32afaca064c424b3e1 /src/peds/Ped.cpp | |
parent | Merge pull request #405 from erorcun/erorcun (diff) | |
download | re3-8476283174411e80b5129611763f1beb868edffc.tar re3-8476283174411e80b5129611763f1beb868edffc.tar.gz re3-8476283174411e80b5129611763f1beb868edffc.tar.bz2 re3-8476283174411e80b5129611763f1beb868edffc.tar.lz re3-8476283174411e80b5129611763f1beb868edffc.tar.xz re3-8476283174411e80b5129611763f1beb868edffc.tar.zst re3-8476283174411e80b5129611763f1beb868edffc.zip |
Diffstat (limited to '')
-rw-r--r-- | src/peds/Ped.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 2cd942f9..51e49875 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; |