diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-03-22 02:50:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 02:50:38 +0100 |
| commit | 23f2ab5ff168e821c54ff84618bd4a5a12476cd5 (patch) | |
| tree | d42b0d0fe6ef7f1b2d68b71ecbc63437d6ab2c4d /src/control/Gangs.h | |
| parent | Merge pull request #349 from Nick007J/master (diff) | |
| parent | Merge branch 'master' into erorcun (diff) | |
| download | re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.gz re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.bz2 re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.lz re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.xz re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.zst re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.zip | |
Diffstat (limited to 'src/control/Gangs.h')
| -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]; }; |