summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-16 09:45:47 +0100
committerGitHub <noreply@github.com>2020-11-16 09:45:47 +0100
commit8a8f2d4e5bcb765471442f165ffe1b597e903e50 (patch)
tree6cde2086c123c3690dbfc4f04cc0f606ce9905c4 /src/peds/Ped.h
parentMake collision code placement more like original (+ small fixes) (diff)
parentMerge branch 'miami' of github.com:GTAmodding/re3 into miami (diff)
downloadre3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.tar
re3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.tar.gz
re3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.tar.bz2
re3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.tar.lz
re3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.tar.xz
re3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.tar.zst
re3-8a8f2d4e5bcb765471442f165ffe1b597e903e50.zip
Diffstat (limited to 'src/peds/Ped.h')
-rw-r--r--src/peds/Ped.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 00ce48f4..497994c2 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -451,9 +451,7 @@ public:
uint32 bVehExitWillBeInstant : 1;
uint32 bHasAlreadyBeenRecorded : 1;
uint32 bFallenDown : 1;
-#ifdef PED_SKIN
- uint32 bDontAcceptIKLookAts : 1; // TODO: find uses of this
-#endif
+ uint32 bDontAcceptIKLookAts : 1;
uint32 bReachedAttractorHeadingTarget : 1;
uint32 bTurnedAroundOnAttractor : 1;
@@ -513,10 +511,7 @@ public:
CEntity* m_pEventEntity;
float m_fAngleToEvent;
AnimBlendFrameData *m_pFrames[PED_NODE_MAX];
-#ifdef PED_SKIN
- // stored inside the clump with non-skin ped
RpAtomic *m_pWeaponModel;
-#endif
AssocGroupId m_animGroup;
CAnimBlendAssociation *m_pVehicleAnim;
CVector2D m_vecAnimMoveDelta;
@@ -579,8 +574,7 @@ public:
CAccident *m_lastAccident;
uint32 m_nPedType;
CPedStats *m_pedStats;
- float m_fleeFromPosX;
- float m_fleeFromPosY;
+ CVector2D m_fleeFromPos;
CEntity *m_fleeFrom;
uint32 m_fleeTimer;
CEntity* m_threatEx; // TODO(Miami): What is this?