summaryrefslogtreecommitdiffstats
path: root/src/entities/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-16 18:14:48 +0200
committerGitHub <noreply@github.com>2019-06-16 18:14:48 +0200
commitbb526541a956f2876936b2e2320c5da9d32d94d1 (patch)
tree593f1f52b771e2acb82c923e016fcbf73b204a7a /src/entities/Ped.h
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
parentChanges for the pull request. (diff)
downloadre3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.gz
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.bz2
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.lz
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.xz
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.tar.zst
re3-bb526541a956f2876936b2e2320c5da9d32d94d1.zip
Diffstat (limited to 'src/entities/Ped.h')
-rw-r--r--src/entities/Ped.h24
1 files changed, 21 insertions, 3 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index adf24c88..28ad6624 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -2,6 +2,7 @@
#include "Physical.h"
#include "Weapon.h"
+#include "PathFind.h"
enum {
PED_MAX_WEAPONS = 13
@@ -163,13 +164,30 @@ public:
int32 m_nPedState;
int32 m_nLastPedState;
int32 m_nMoveState;
- uint8 stuff2[188];
+ int32 m_nStoredActionState;
+ int32 m_nPrevActionState;
+ int32 m_nWaitState;
+ int32 m_nWaitTimer;
+private:
+ uint32 stuff0[28];
+public:
+ uint16 m_nPathNodes;
+ uint8 m_nCurPathNode;
+ int8 m_nPathState;
+private:
+ int8 _pad2B5[3];
+public:
+ CPathNode *m_pNextPathNode;
+ CPathNode *m_pLastPathNode;
+ Float m_fHealth;
+ Float m_fArmour;
+ uint8 stuff2[34];
CEntity *m_pCurrentPhysSurface;
CVector m_vecOffsetFromPhysSurface;
CEntity *m_pCurSurface;
uint8 stuff3[16];
CVehicle *m_pMyVehicle;
- bool bInVehicle;
+ Bool bInVehicle;
uint8 stuff4[23];
int32 m_nPedType;
@@ -188,7 +206,7 @@ public:
bool UseGroundColModel(void);
void KillPedWithCar(CVehicle *veh, float impulse);
CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; }
-
+
static Bool &bNastyLimbsCheat;
static Bool &bPedCheat2;
static Bool &bPedCheat3;