summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-10 15:06:08 +0200
committerGitHub <noreply@github.com>2019-07-10 15:06:08 +0200
commit80e0409d6a1bfd002b98af8d598ec940b6d6facb (patch)
tree5e0a6dcdbf8f1566974c0514986ab7b61e5c067a /src/peds/Ped.h
parentfixed COMMAND_IS_PLAYER_IN_AREA_3D (diff)
parentMerge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff)
downloadre3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar
re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.gz
re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.bz2
re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.lz
re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.xz
re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.tar.zst
re3-80e0409d6a1bfd002b98af8d598ec940b6d6facb.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 f48c30ba..cd7d88af 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -13,7 +13,7 @@
struct CPathNode;
-enum eWaitState : uint32 {
+enum eWaitState {
WAITSTATE_FALSE,
WAITSTATE_TRAFFIC_LIGHTS,
WAITSTATE_CROSS_ROAD,
@@ -292,10 +292,10 @@ public:
int32 m_nPrevActionState;
eWaitState m_nWaitState;
uint32 m_nWaitTimer;
- void *m_pPathNodesStates[8];
+ void *m_pPathNodesStates[8]; // seems unused
CVector2D m_stPathNodeStates[10];
uint16 m_nPathNodes;
- uint8 m_nCurPathNode;
+ int16 m_nCurPathNode;
int8 m_nPathState;
private:
int8 _pad2B5[3];
@@ -324,7 +324,7 @@ public:
CVehicle *m_pMyVehicle;
bool bInVehicle;
uint8 pad_315[3];
- uint32 field_318;
+ float field_318;
uint8 field_31C;
uint8 field_31D;
int16 m_phoneId;
@@ -458,7 +458,8 @@ public:
bool TurnBody(void);
void Chat(void);
void MakeChangesForNewWeapon(int8);
-
+ void CheckAroundForPossibleCollisions(void);
+ bool Seek(void);
// Static methods
static void GetLocalPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enterType, float offset);