summaryrefslogtreecommitdiffstats
path: root/src/control/Gangs.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-03-28 15:47:52 +0100
committereray orçunus <erayorcunus@gmail.com>2020-03-28 16:52:25 +0100
commit112685ebac0a4f5da50fdc60ff71c35a5cddbdfa (patch)
treefb1223f514ddbf339bed0bed6a269ad1ad63c374 /src/control/Gangs.cpp
parentremove include <new> from common.h (diff)
downloadre3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.gz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.bz2
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.lz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.xz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.zst
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.zip
Diffstat (limited to '')
-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)