diff options
author | aap <aap@papnet.eu> | 2019-07-05 14:23:39 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-05 14:23:39 +0200 |
commit | 396b43cbd4f5495c6c3c555d6b58ccfdbbf964fb (patch) | |
tree | 5fb23c404383f4b7436410bd1816498f27c2cd4a /src/entities/Ped.h | |
parent | fixed rand (thanks nick) (diff) | |
download | re3-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 'src/entities/Ped.h')
-rw-r--r-- | src/entities/Ped.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h index 558ec9c1..0e2b14a7 100644 --- a/src/entities/Ped.h +++ b/src/entities/Ped.h @@ -60,8 +60,8 @@ enum { }; enum { - CREATED_BY_RANDOM = 1, - CREATED_BY_SCRIPT + RANDOM_CHAR = 1, + MISSION_CHAR, }; enum PedLineUpPhase { @@ -130,15 +130,15 @@ enum PedState PED_PASSENGER, PED_TAXI_PASSENGER, PED_OPEN_DOOR, - PED_DIE = 48, - PED_DEAD = 49, + PED_DIE, + PED_DEAD, PED_CARJACK, PED_DRAG_FROM_CAR, PED_ENTER_CAR, PED_STEAL_CAR, PED_EXIT_CAR, PED_HANDS_UP, - PED_ARRESTED = 56, + PED_ARRESTED, }; enum eMoveState { @@ -157,6 +157,8 @@ public: // 0x128 CStoredCollPoly m_collPoly; float m_fCollisionSpeed; + + // cf. https://github.com/DK22Pac/plugin-sdk/blob/master/plugin_sa/game_sa/CPed.h from R* uint8 bIsStanding : 1; uint8 m_ped_flagA2 : 1; uint8 m_ped_flagA4 : 1; // stores (CTimer::GetTimeInMilliseconds() < m_lastHitTime) @@ -177,7 +179,7 @@ public: uint8 m_ped_flagC1 : 1; uint8 m_ped_flagC2 : 1; - uint8 m_ped_flagC4 : 1; + uint8 m_ped_flagC4 : 1; // false when in bus, bRenderPedInCar? uint8 m_ped_flagC8 : 1; uint8 m_ped_flagC10 : 1; uint8 m_ped_flagC20 : 1; // just left some body part? @@ -237,8 +239,9 @@ public: uint8 m_ped_flagI20 : 1; uint8 m_ped_flagI40 : 1; uint8 m_ped_flagI80 : 1; + uint8 stuff10[3]; - uint8 m_nCreatedBy; + uint8 CharCreatedBy; uint8 field_161; uint8 pad_162[2]; eObjective m_objective; @@ -487,6 +490,8 @@ public: inline CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; } inline CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; } inline RwFrame *GetNodeFrame(int nodeId) { return m_pFrames[nodeId]->frame; } + PedState GetPedState(void) { return m_nPedState; } + void SetPedState(PedState state) { m_nPedState = state; } // to make patching virtual functions possible void SetModelIndex_(uint32 mi) { CPed::SetModelIndex(mi); } |