diff options
Diffstat (limited to 'src/control/Gangs.h')
| -rw-r--r-- | src/control/Gangs.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/control/Gangs.h b/src/control/Gangs.h index db14ca64..2366614b 100644 --- a/src/control/Gangs.h +++ b/src/control/Gangs.h @@ -1,8 +1,6 @@ #pragma once -#include "common.h" #include "Weapon.h" -#include "ModelIndices.h" struct CGangInfo { @@ -13,31 +11,27 @@ struct CGangInfo eWeaponType m_Weapon1; eWeaponType m_Weapon2; - CGangInfo() : - m_nVehicleMI(MI_BUS), - m_nPedModelOverride(-1), - m_Weapon1(WEAPONTYPE_UNARMED), - m_Weapon2(WEAPONTYPE_UNARMED) - {} + CGangInfo(); }; static_assert(sizeof(CGangInfo) == 0x10, "CGangInfo: error"); +enum { + GANG_MAFIA = 0, + GANG_TRIAD, + GANG_DIABLOS, + GANG_YAKUZA, + GANG_YARDIE, + GANG_COLUMB, + GANG_HOODS, + GANG_7, + GANG_8, + NUM_GANGS +}; + class CGangs { public: - enum { - GANG_MAFIA = 0, - GANG_TRIAD, - GANG_DIABLOS, - GANG_YAKUZA, - GANG_YARDIE, - GANG_COLUMB, - GANG_HOODS, - GANG_7, - GANG_8, - NUM_GANGS - }; static void Initialize(void); static void SetGangVehicleModel(int16, int); static void SetGangWeapons(int16, eWeaponType, eWeaponType); @@ -45,9 +39,9 @@ public: static int8 GetGangPedModelOverride(int16); static void SaveAllGangData(uint8 *, uint32 *); static void LoadAllGangData(uint8 *, uint32); + static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; } private: - static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; } static CGangInfo(&Gang)[NUM_GANGS]; }; |