diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-17 22:43:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 22:43:43 +0200 |
commit | 5d98e12b85565d84b980bcc2ea73fd449691c943 (patch) | |
tree | e6b421513dfac9908ae727290ab7ec947842cdf3 /src/peds/Ped.h | |
parent | Merge pull request #208 from Nick007J/master (diff) | |
parent | Peds, a fix and a tad of VC (diff) | |
download | re3-5d98e12b85565d84b980bcc2ea73fd449691c943.tar re3-5d98e12b85565d84b980bcc2ea73fd449691c943.tar.gz re3-5d98e12b85565d84b980bcc2ea73fd449691c943.tar.bz2 re3-5d98e12b85565d84b980bcc2ea73fd449691c943.tar.lz re3-5d98e12b85565d84b980bcc2ea73fd449691c943.tar.xz re3-5d98e12b85565d84b980bcc2ea73fd449691c943.tar.zst re3-5d98e12b85565d84b980bcc2ea73fd449691c943.zip |
Diffstat (limited to 'src/peds/Ped.h')
-rw-r--r-- | src/peds/Ped.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index a14a8c4b..177f934d 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -14,6 +14,7 @@ #include "EventList.h" struct CPathNode; +class CAccident; struct CPedAudioData { @@ -57,6 +58,7 @@ struct FightMove }; static_assert(sizeof(FightMove) == 0x18, "FightMove: error"); +// TO-DO: This is eFightState on mobile. enum PedFightMoves { FIGHTMOVE_NULL, @@ -169,7 +171,7 @@ enum { enum PedLineUpPhase { LINE_UP_TO_CAR_START, LINE_UP_TO_CAR_END, - LINE_UP_TO_CAR_2 + LINE_UP_TO_CAR_2 // Buggy. Used for cops arresting you from passenger door }; enum PedOnGroundState { @@ -330,7 +332,7 @@ public: uint8 bClearObjective : 1; uint8 m_ped_flagH10 : 1; uint8 bCollidedWithMyVehicle : 1; - uint8 m_ped_flagH40 : 1; + uint8 bRichFromMugging : 1; // ped has lots of cash from mugging people - will drop money if someone points gun to him uint8 m_ped_flagH80 : 1; uint8 bShakeFist : 1; // test shake hand at look entity @@ -411,9 +413,9 @@ public: bool bRunningToPhone; uint8 field_31D; int16 m_phoneId; - uint32 m_lookingForPhone; // unused + eCrimeType m_crimeToReportOnPhone; uint32 m_phoneTalkTimer; - void *m_lastAccident; + CAccident *m_lastAccident; int32 m_nPedType; CPedStats *m_pedStats; float m_fleeFromPosX; @@ -646,6 +648,8 @@ public: void SeekCar(void); void SeekBoatPosition(void); bool PositionPedOutOfCollision(void); + bool RunToReportCrime(eCrimeType); + bool PlacePedOnDryLand(void); // Static methods static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset); @@ -724,6 +728,7 @@ public: PedState GetPedState(void) { return m_nPedState; } void SetPedState(PedState state) { m_nPedState = state; } bool DyingOrDead(void) { return m_nPedState == PED_DIE || m_nPedState == PED_DEAD; } + void GiveWeaponBackAfterExitingCar(void); // set by 0482:set_threat_reaction_range_multiplier opcode static uint16 &nThreatReactionRangeMultiplier; |