summaryrefslogtreecommitdiffstats
path: root/src/entities/Ped.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-05 14:23:39 +0200
committeraap <aap@papnet.eu>2019-07-05 14:23:39 +0200
commit396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb (patch)
tree5fb23c404383f4b7436410bd1816498f27c2cd4a /src/entities/Ped.cpp
parentfixed rand (thanks nick) (diff)
downloadre3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.tar
re3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.tar.gz
re3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.tar.bz2
re3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.tar.lz
re3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.tar.xz
re3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.tar.zst
re3-396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Ped.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp
index 9e1836c2..df965f32 100644
--- a/src/entities/Ped.cpp
+++ b/src/entities/Ped.cpp
@@ -104,7 +104,7 @@ CPed::FlagToDestroyWhenNextProcessed(void)
}
bInVehicle = false;
m_pMyVehicle = nil;
- if (m_nCreatedBy == CREATED_BY_SCRIPT)
+ if (CharCreatedBy == MISSION_CHAR)
m_nPedState = PED_DEAD;
else
m_nPedState = PED_NONE;
@@ -283,7 +283,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
m_talkType = 167;
m_objective = OBJECTIVE_NONE;
m_prevObjective = OBJECTIVE_NONE;
- m_nCreatedBy = CREATED_BY_RANDOM;
+ CharCreatedBy = RANDOM_CHAR;
m_leader = nil;
m_pedInObjective = nil;
m_carInObjective = nil;
@@ -1341,13 +1341,13 @@ CPed::BeingDraggedFromCar(void)
if (m_vehEnterType == VEHICLE_ENTER_FRONT_LEFT || m_vehEnterType == VEHICLE_ENTER_REAR_LEFT) {
if (m_ped_flagF10) {
enterAnim = ANIM_CAR_QJACKED;
- } else if (m_pMyVehicle->bIsLow) {
+ } else if (m_pMyVehicle->bLowVehicle) {
enterAnim = ANIM_CAR_LJACKED_LHS;
} else {
enterAnim = ANIM_CAR_JACKED_LHS;
}
} else if (m_vehEnterType == VEHICLE_ENTER_FRONT_RIGHT || m_vehEnterType == VEHICLE_ENTER_REAR_RIGHT) {
- if (m_pMyVehicle->bIsLow)
+ if (m_pMyVehicle->bLowVehicle)
enterAnim = ANIM_CAR_LJACKED_RHS;
else
enterAnim = ANIM_CAR_JACKED_RHS;
@@ -1470,7 +1470,7 @@ CPed::GetLocalPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enter
vehDoorOffset = offsetToOpenVanDoor;
} else {
seatOffset = veh->m_handling->fSeatOffsetDistance * seatPosMult;
- if (veh->bIsLow) {
+ if (veh->bLowVehicle) {
vehDoorOffset = offsetToOpenLowCarDoor;
} else {
vehDoorOffset = offsetToOpenRegularCarDoor;
@@ -2222,10 +2222,10 @@ CPed::CanBeDeleted(void)
if (this->bInVehicle)
return false;
- switch (m_nCreatedBy) {
- case CREATED_BY_RANDOM:
+ switch (CharCreatedBy) {
+ case RANDOM_CHAR:
return true;
- case CREATED_BY_SCRIPT:
+ case MISSION_CHAR:
return false;
default:
return true;
@@ -2521,7 +2521,7 @@ CPed::SetObjective(eObjective newObj, void *entity)
m_vecSeekVehicle = CVector(0.0f, 0.0f, 0.0f);
if (newObj == OBJECTIVE_SOLICIT) {
m_objectiveTimer = CTimer::GetTimeInMilliseconds() + 10000;
- } else if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_nCreatedBy == CREATED_BY_SCRIPT &&
+ } else if (m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER && CharCreatedBy == MISSION_CHAR &&
(m_carInObjective->m_status == STATUS_PLAYER_DISABLED || CPad::GetPad(CWorld::PlayerInFocus)->DisablePlayerControls)) {
SetObjectiveTimer(14000);
} else {