summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2019-10-27 04:39:56 +0100
committerGitHub <noreply@github.com>2019-10-27 04:39:56 +0100
commitc39cf2d960ce546c544872a732560b731d8c3897 (patch)
treed7a4b2ec22bcb6a9f6d8ef2602c7fdbac417d18b /src/peds/Ped.h
parentControllerConfig done (diff)
parentMerge branch 'master' into master (diff)
downloadre3-c39cf2d960ce546c544872a732560b731d8c3897.tar
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.gz
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.bz2
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.lz
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.xz
re3-c39cf2d960ce546c544872a732560b731d8c3897.tar.zst
re3-c39cf2d960ce546c544872a732560b731d8c3897.zip
Diffstat (limited to 'src/peds/Ped.h')
-rw-r--r--src/peds/Ped.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 7a0ade14..b8d2f5dd 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -294,9 +294,9 @@ public:
uint8 bIsLanding : 1;
uint8 bIsRunning : 1; // on some conditions
uint8 bHitSomethingLastFrame : 1;
- uint8 m_ped_flagB80 : 1; // bIsNearCar? it's sure that it's related with cars and used for deciding whether we should move
+ uint8 bVehEnterDoorIsBlocked : 1; // because someone else enters/exits from there
- uint8 m_ped_flagC1 : 1; // bCanPedEnterSeekedCar?
+ uint8 bCanPedEnterSeekedCar : 1;
uint8 bRespondsToThreats : 1;
uint8 bRenderPedInCar : 1;
uint8 bChangedSeat : 1;
@@ -669,7 +669,7 @@ public:
bool PlacePedOnDryLand(void);
bool PossiblyFindBetterPosToSeekCar(CVector*, CVehicle*);
void UpdateFromLeader(void);
- int ScanForThreats(void);
+ uint32 ScanForThreats(void);
void SetEnterCar(CVehicle*, uint32);
bool WarpPedToNearEntityOffScreen(CEntity*);
void SetExitCar(CVehicle*, uint32);
@@ -678,6 +678,9 @@ public:
void SetEnterTrain(CVehicle*, uint32);
void SetEnterCar_AllClear(CVehicle*, uint32, uint32);
void SetSolicit(uint32 time);
+ void ScanForInterestingStuff(void);
+ void WarpPedIntoCar(CVehicle*);
+ void SetCarJack(CVehicle*);
// Static methods
static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset);