diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 11:09:18 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-22 11:09:18 +0100 |
| commit | 65e85587941101f8ae346a363b1594b63983417b (patch) | |
| tree | 2cb412d78396b2fea57dd39f06d1a3af9cacb8d1 /src/control/Gangs.h | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | Merge pull request #348 from erorcun/erorcun (diff) | |
| download | re3-65e85587941101f8ae346a363b1594b63983417b.tar re3-65e85587941101f8ae346a363b1594b63983417b.tar.gz re3-65e85587941101f8ae346a363b1594b63983417b.tar.bz2 re3-65e85587941101f8ae346a363b1594b63983417b.tar.lz re3-65e85587941101f8ae346a363b1594b63983417b.tar.xz re3-65e85587941101f8ae346a363b1594b63983417b.tar.zst re3-65e85587941101f8ae346a363b1594b63983417b.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/Gangs.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/control/Gangs.h b/src/control/Gangs.h index 379543ee..a348f259 100644 --- a/src/control/Gangs.h +++ b/src/control/Gangs.h @@ -32,18 +32,15 @@ class CGangs public: static void Initialize(void); static void SetGangVehicleModel(int16, int32); - static void SetGangWeapons(int16, eWeaponType, eWeaponType); + static void SetGangWeapons(int16, int32, int32); static void SetGangPedModelOverride(int16, int8); static int8 GetGangPedModelOverride(int16); static void SaveAllGangData(uint8 *, uint32 *); static void LoadAllGangData(uint8 *, uint32); static int32 GetGangVehicleModel(int16 gang) { return Gang[gang].m_nVehicleMI; } - static eWeaponType GetGangWeapon1(int16 gang) { return Gang[gang].m_Weapon1; } - static eWeaponType GetGangWeapon2(int16 gang) { return Gang[gang].m_Weapon2; } - static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; } + static CGangInfo *GetGangInfo(int16 gang) { return &Gang[gang]; } private: - static CGangInfo(&Gang)[NUM_GANGS]; - + static CGangInfo Gang[NUM_GANGS]; }; |