summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-09 15:43:25 +0200
committerGitHub <noreply@github.com>2020-06-09 15:43:25 +0200
commitb07b1f0b519813c93a95b7baa2928c4d42c23af7 (patch)
tree552a3d776e1938d917901e7f2d46eb6db4af8f7a /src/peds/Ped.h
parentMerge branch 'master' into miami (diff)
parentPeds, bike center of mass and reversing fixes (diff)
downloadre3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.tar
re3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.tar.gz
re3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.tar.bz2
re3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.tar.lz
re3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.tar.xz
re3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.tar.zst
re3-b07b1f0b519813c93a95b7baa2928c4d42c23af7.zip
Diffstat (limited to 'src/peds/Ped.h')
-rw-r--r--src/peds/Ped.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 681fc033..6338b889 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -469,14 +469,14 @@ public:
//uint32 b157_8
//uint32 b157_10
//uint32 b157_20
- //uint32 b157_40
+ uint32 b157_40 : 1;
uint32 bIgnoreThreatsBehindObjects : 1;
uint32 bNeverEverTargetThisPed : 1;
uint32 bCrouchWhenScared : 1;
uint32 bKnockedOffBike : 1;
//uint32 b158_8
- //uint32 b158_10
+ uint32 b158_10 : 1;
uint32 bBoughtIceCream : 1;
//uint32 b158_40
//uint32 b158_80
@@ -654,14 +654,14 @@ public:
void AimGun(void);
void KillPedWithCar(CVehicle *veh, float impulse);
void Say(uint16 audio);
- void SetLookFlag(CEntity *target, bool keepTryingToLook);
- void SetLookFlag(float direction, bool keepTryingToLook);
+ void SetLookFlag(CEntity* target, bool keepTryingToLook, bool cancelPrevious = false);
+ void SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious = false);
void SetLookTimer(int time);
void SetDie(AnimationId anim = ANIM_KO_SHOT_FRONT1, float arg1 = 4.0f, float arg2 = 0.0f);
void SetDead(void);
void ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer);
void RemoveBodyPart(PedNode nodeId, int8 direction);
- bool OurPedCanSeeThisOne(CEntity *target);
+ bool OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock = false);
void Avoid(void);
void Attack(void);
void ClearAimFlag(void);
@@ -842,6 +842,7 @@ public:
void PedShuffle();
void DriveVehicle();
void PositionAttachedPed();
+ bool CanUseTorsoWhenLooking();
// Static methods
static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset);