diff options
| author | erorcun <erayorcunus@gmail.com> | 2019-11-26 20:21:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 20:21:18 +0100 |
| commit | e35019cb1ba171db6d140a0905a7159d419e670f (patch) | |
| tree | ba9e97db70363916e72b630c6fd5b9c927336476 /src/peds/Ped.h | |
| parent | Merge pull request #272 from erorcun/erorcun (diff) | |
| parent | CCivilianPed done & restore peds running to phone (diff) | |
| download | re3-e35019cb1ba171db6d140a0905a7159d419e670f.tar re3-e35019cb1ba171db6d140a0905a7159d419e670f.tar.gz re3-e35019cb1ba171db6d140a0905a7159d419e670f.tar.bz2 re3-e35019cb1ba171db6d140a0905a7159d419e670f.tar.lz re3-e35019cb1ba171db6d140a0905a7159d419e670f.tar.xz re3-e35019cb1ba171db6d140a0905a7159d419e670f.tar.zst re3-e35019cb1ba171db6d140a0905a7159d419e670f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/Ped.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index eb8fb3d0..58b189ee 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -246,6 +246,8 @@ enum PedState PED_UNKNOWN, // HANG_OUT in Fire_Head's idb PED_STATES_NO_AI, + + // One of these states isn't on PS2 - start PED_JUMP, PED_FALL, PED_GETUP, @@ -256,6 +258,8 @@ enum PedState PED_ENTER_TRAIN, PED_EXIT_TRAIN, PED_ARREST_PLAYER, + // One of these states isn't on PS2 - end + PED_DRIVING, PED_PASSENGER, PED_TAXI_PASSENGER, @@ -371,8 +375,8 @@ public: #else uint8 m_ped_flagI20 : 1; #endif - uint8 m_ped_flagI40 : 1; - uint8 m_ped_flagI80 : 1; + uint8 m_ped_flagI40 : 1; // bMakePedsRunToPhonesToReportCrimes makes use of this as runover by car indicator + uint8 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle uint8 stuff10[3]; uint8 CharCreatedBy; @@ -407,7 +411,7 @@ public: int32 m_nPrevMoveState; eWaitState m_nWaitState; uint32 m_nWaitTimer; - void *m_pPathNodesStates[8]; // seems unused, probably leftover from VC + void *m_pPathNodesStates[8]; // unused, probably leftover from VC CVector2D m_stPathNodeStates[10]; uint16 m_nPathNodes; int16 m_nCurPathNode; @@ -691,6 +695,7 @@ public: void WarpPedIntoCar(CVehicle*); void SetCarJack(CVehicle*); bool WarpPedToNearLeaderOffScreen(void); + void Solicit(void); // Static methods static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset); @@ -798,10 +803,13 @@ public: static CVector2D ms_vec2DFleePosition; static CPedAudioData (&CommentWaitTime)[38]; -#ifndef MASTER +#ifdef TOGGLEABLE_BETA_FEATURES static bool bUnusedFightThingOnPlayer; static bool bPopHeadsOnHeadshot; + static bool bMakePedsRunToPhonesToReportCrimes; +#endif +#ifndef MASTER // Mobile things static void SwitchDebugDisplay(void); void DebugRenderOnePedText(void); |