summaryrefslogtreecommitdiffstats
path: root/src/entities/Ped.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-06-30 12:59:55 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-06-30 12:59:55 +0200
commite2bd3573b4d44b8f80197d8de98fcfc91e2229b8 (patch)
tree7e3436ed3945245fca67127d00e0ccfee6d31239 /src/entities/Ped.h
parentProcessCarUpdate (diff)
downloadre3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.tar
re3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.tar.gz
re3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.tar.bz2
re3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.tar.lz
re3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.tar.xz
re3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.tar.zst
re3-e2bd3573b4d44b8f80197d8de98fcfc91e2229b8.zip
Diffstat (limited to '')
-rw-r--r--src/entities/Ped.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index f83594aa..2edbd9e2 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -9,6 +9,7 @@
#include "AnimBlendClumpData.h"
#include "AnimBlendAssociation.h"
#include "WeaponInfo.h"
+#include "Fire.h"
struct CPathNode;
@@ -184,7 +185,9 @@ public:
uint8 m_ped_flagI20 : 1;
uint8 m_ped_flagI40 : 1;
uint8 m_ped_flagI80 : 1;
- uint8 stuff10[15];
+ uint8 stuff10[3];
+ uint8 m_nCreatedBy;
+ uint8 stuff14[11];
CPed *m_field_16C;
uint8 stuff12[44];
int32 m_pEventEntity;
@@ -243,7 +246,8 @@ public:
uint8 stuff[2];
int32 m_pPointGunAt;
CVector m_vecHitLastPos;
- uint8 stuff8[12];
+ uint8 stuff8[8];
+ CFire* m_pFire;
CEntity *m_pLookTarget;
float m_fLookDirection;
int32 m_wepModelID;
@@ -266,8 +270,14 @@ public:
uint8 stuff11[30];
static void *operator new(size_t);
+ static void *operator new(size_t, int);
static void operator delete(void*, size_t);
+ ~CPed(void);
+ void FlagToDestroyWhenNextProcessed(void);
+
+ void dtor(void) { this->CPed::~CPed(); }
+
bool IsPlayer(void);
bool UseGroundColModel(void);
bool CanSetPedState(void);
@@ -301,6 +311,7 @@ public:
void LineUpPedWithCar(PedLineUpPhase phase);
void SetPedPositionInCar(void);
void PlayFootSteps(void);
+ void QuitEnteringCar(void);
static void GetLocalPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enterType, float offset);
static void GetPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enterType, float seatPosMult);
static void GetPositionToOpenCarDoor(CVector* output, CVehicle* veh, uint32 enterType);