diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-06-18 15:55:39 +0300 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-06-18 23:01:03 +0300 |
| commit | c9f6e7bf83dcef53f13de9e24fa9c6113cf1f0fa (patch) | |
| tree | e12607035cf235f3d71979ba006b4a69bba31564 /src/control/PedType.h | |
| parent | 886db44936757c4ace710b40713fbae1aa575c45 (diff) | |
CPed merge fixes
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
Diffstat (limited to 'src/control/PedType.h')
| -rw-r--r-- | src/control/PedType.h | 61 |
1 files changed, 58 insertions, 3 deletions
diff --git a/src/control/PedType.h b/src/control/PedType.h index 563dc294..1d1057d7 100644 --- a/src/control/PedType.h +++ b/src/control/PedType.h @@ -1,7 +1,62 @@ #pragma once -class CPedType -{ +#include "common.h" +#include "templates.h" +#include "Lists.h" + +class CPedType { public: - static int32 FindPedType(char *type); + union tPedTypeFlags + { + uint32 IntValue; + struct + { + uint8 bPlayer1 : 1; + uint8 bPlayer2 : 1; + uint8 bPlayer3 : 1; + uint8 bPlayer4 : 1; + uint8 bCivmale : 1; + uint8 bCivfemale : 1; + uint8 bCop : 1; + uint8 bGang1 : 1; + + uint8 bGang2 : 1; + uint8 bGang3 : 1; + uint8 bGang4 : 1; + uint8 bGang5 : 1; + uint8 bGang6 : 1; + uint8 bGang7 : 1; + uint8 bGang8 : 1; + uint8 bGang9 : 1; + + uint8 bEmergency : 1; + uint8 bProstitute : 1; + uint8 bCriminal : 1; + uint8 bSpecial : 1; + uint8 bGun : 1; + uint8 bCop_car : 1; + uint8 bFast_car : 1; + uint8 bExplosion : 1; + + uint8 bFireman : 1; + uint8 bDeadpeds : 1; + }; + }; + + tPedTypeFlags m_Type; + float field_4; + float field_8; + float field_C; + float field_10; + float field_14; + tPedTypeFlags m_Threat; + tPedTypeFlags m_Avoid; + + static CPedType* (&ms_apPedType)[23]; + + static void Initialise(); + static void LoadPedData(); + static int32 FindPedType(char* type); }; + +static_assert(sizeof(CPedType) == 0x20, "CPedType: error");
\ No newline at end of file |