summaryrefslogtreecommitdiffstats
path: root/src/entities/Ped.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-05-19 21:28:10 +0200
committeraap <aap@papnet.eu>2019-05-19 21:28:10 +0200
commitc4f9b9573f1535d3297946fbb5c73393594ffa24 (patch)
tree47acb1934d86d3ab220035258a2345f526c9b922 /src/entities/Ped.h
parentmore work on CPhysical (diff)
downloadre3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.gz
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.bz2
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.lz
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.xz
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.tar.zst
re3-c4f9b9573f1535d3297946fbb5c73393594ffa24.zip
Diffstat (limited to 'src/entities/Ped.h')
-rw-r--r--src/entities/Ped.h84
1 files changed, 81 insertions, 3 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index fe448a94..4236340e 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -13,7 +13,81 @@ class CPed : public CPhysical
{
public:
// 0x128
- uint8 stuff1[252];
+ CStoredCollPoly m_collPoly;
+ float m_fCollisionSpeed;
+ uint8 m_ped_flagA1 : 1;
+ uint8 m_ped_flagA2 : 1;
+ uint8 m_ped_flagA4 : 1;
+ uint8 m_ped_flagA8 : 1;
+ uint8 m_ped_flagA10 : 1;
+ uint8 m_ped_flagA20 : 1;
+ uint8 m_ped_flagA40 : 1;
+ uint8 m_ped_flagA80 : 1;
+ uint8 m_ped_flagB1 : 1;
+ uint8 m_ped_flagB2 : 1;
+ uint8 m_ped_flagB4 : 1;
+ uint8 m_ped_flagB8 : 1;
+ uint8 m_ped_flagB10 : 1;
+ uint8 m_ped_flagB20 : 1;
+ uint8 m_ped_flagB40 : 1;
+ uint8 m_ped_flagB80 : 1;
+ uint8 m_ped_flagC1 : 1;
+ uint8 m_ped_flagC2 : 1;
+ uint8 m_ped_flagC4 : 1;
+ uint8 m_ped_flagC8 : 1;
+ uint8 m_ped_flagC10 : 1;
+ uint8 m_ped_flagC20 : 1;
+ uint8 m_ped_flagC40 : 1;
+ uint8 m_ped_flagC80 : 1;
+ uint8 m_ped_flagD1 : 1;
+ uint8 m_ped_flagD2 : 1;
+ uint8 m_ped_flagD4 : 1;
+ uint8 m_ped_flagD8 : 1;
+ uint8 m_ped_flagD10 : 1;
+ uint8 m_ped_flagD20 : 1;
+ uint8 m_ped_flagD40 : 1;
+ uint8 m_ped_flagD80 : 1;
+ uint8 m_ped_flagE1 : 1;
+ uint8 m_ped_flagE2 : 1;
+ uint8 m_ped_flagE4 : 1;
+ uint8 m_ped_flagE8 : 1;
+ uint8 m_ped_flagE10 : 1;
+ uint8 m_ped_flagE20 : 1;
+ uint8 m_ped_flagE40 : 1;
+ uint8 m_ped_flagE80 : 1;
+ uint8 m_ped_flagF1 : 1;
+ uint8 m_ped_flagF2 : 1;
+ uint8 m_ped_flagF4 : 1;
+ uint8 m_ped_flagF8 : 1;
+ uint8 m_ped_flagF10 : 1;
+ uint8 m_ped_flagF20 : 1;
+ uint8 m_ped_flagF40 : 1;
+ uint8 m_ped_flagF80 : 1;
+ uint8 m_ped_flagG1 : 1;
+ uint8 m_ped_flagG2 : 1;
+ uint8 m_ped_flagG4 : 1;
+ uint8 m_ped_flagG8 : 1;
+ uint8 m_ped_flagG10 : 1;
+ uint8 m_ped_flagG20 : 1;
+ uint8 m_ped_flagG40 : 1;
+ uint8 m_ped_flagG80 : 1;
+ uint8 m_ped_flagH1 : 1;
+ uint8 m_ped_flagH2 : 1;
+ uint8 m_ped_flagH4 : 1;
+ uint8 m_ped_flagH8 : 1;
+ uint8 m_ped_flagH10 : 1;
+ uint8 m_ped_flagH20 : 1;
+ uint8 m_ped_flagH40 : 1;
+ uint8 m_ped_flagH80 : 1;
+ uint8 m_ped_flagI1 : 1;
+ uint8 m_ped_flagI2 : 1;
+ uint8 m_ped_flagI4 : 1;
+ uint8 m_ped_flagI8 : 1;
+ uint8 m_ped_flagI10 : 1;
+ uint8 m_ped_flagI20 : 1;
+ uint8 m_ped_flagI40 : 1;
+ uint8 m_ped_flagI80 : 1;
+ uint8 stuff1[199];
int32 m_nPedState;
uint8 stuff2[196];
CEntity *m_pCurrentPhysSurface;
@@ -26,14 +100,18 @@ public:
int32 m_nPedType;
uint8 stuff5[28];
- CVehicle *m_pCollidingVehicle;
+ CEntity *m_pCollidingEntity;
uint8 stuff6[496];
+// static void *operator new(size_t);
+// static void operator delete(void*, size_t);
+
bool IsPlayer(void) { return m_nPedType == 0 || m_nPedType== 1 || m_nPedType == 2 || m_nPedType == 3; }
+ void KillPedWithCar(CVehicle *veh, float impulse);
};
static_assert(offsetof(CPed, m_nPedState) == 0x224, "CPed: error");
static_assert(offsetof(CPed, m_pCurSurface) == 0x2FC, "CPed: error");
static_assert(offsetof(CPed, m_pMyVehicle) == 0x310, "CPed: error");
static_assert(offsetof(CPed, m_nPedType) == 0x32C, "CPed: error");
-static_assert(offsetof(CPed, m_pCollidingVehicle) == 0x34C, "CPed: error");
+static_assert(offsetof(CPed, m_pCollidingEntity) == 0x34C, "CPed: error");
static_assert(sizeof(CPed) == 0x540, "CPed: error");