summaryrefslogtreecommitdiffstats
path: root/src/control/Gangs.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-03-28 17:12:22 +0100
committerGitHub <noreply@github.com>2020-03-28 17:12:22 +0100
commitc056871e0766c587e45797405f6432715beba810 (patch)
tree8b0d0c7f364decebaaeacc8a328491404213964a /src/control/Gangs.cpp
parentMerge pull request #362 from Fire-Head/master (diff)
parentCCopPed done and #include cleanup (diff)
downloadre3-c056871e0766c587e45797405f6432715beba810.tar
re3-c056871e0766c587e45797405f6432715beba810.tar.gz
re3-c056871e0766c587e45797405f6432715beba810.tar.bz2
re3-c056871e0766c587e45797405f6432715beba810.tar.lz
re3-c056871e0766c587e45797405f6432715beba810.tar.xz
re3-c056871e0766c587e45797405f6432715beba810.tar.zst
re3-c056871e0766c587e45797405f6432715beba810.zip
Diffstat (limited to 'src/control/Gangs.cpp')
-rw-r--r--src/control/Gangs.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp
index f9cb4698..340fe0f6 100644
--- a/src/control/Gangs.cpp
+++ b/src/control/Gangs.cpp
@@ -1,7 +1,8 @@
#include "common.h"
#include "patcher.h"
#include "ModelIndices.h"
-#include "Gangs.h"
+#include "Gangs.h"
+#include "Weapon.h"
//CGangInfo(&CGangs::Gang)[NUM_GANGS] = *(CGangInfo(*)[NUM_GANGS])*(uintptr*)0x6EDF78;
CGangInfo CGangs::Gang[NUM_GANGS];
@@ -38,8 +39,8 @@ void CGangs::SetGangVehicleModel(int16 gang, int32 model)
void CGangs::SetGangWeapons(int16 gang, int32 weapon1, int32 weapon2)
{
CGangInfo *gi = GetGangInfo(gang);
- gi->m_Weapon1 = (eWeaponType)weapon1;
- gi->m_Weapon2 = (eWeaponType)weapon2;
+ gi->m_Weapon1 = weapon1;
+ gi->m_Weapon2 = weapon2;
}
void CGangs::SetGangPedModelOverride(int16 gang, int8 ovrd)