From 370c4e48cd87122e8d38f1a72f6b8f62ff7b9c96 Mon Sep 17 00:00:00 2001
From: Filip Gawin <filip.gawin@zoho.com>
Date: Sun, 19 Apr 2020 18:34:08 +0200
Subject: Try to build with mingw

---
 src/weapons/Weapon.h | 50 ++------------------------------------------------
 1 file changed, 2 insertions(+), 48 deletions(-)

(limited to 'src/weapons/Weapon.h')

diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index 265ffddb..2c3a9657 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -1,56 +1,10 @@
 #pragma once
 
+#include "WeaponType.h"
+
 #define DRIVEBYAUTOAIMING_MAXDIST (2.5f)
 #define DOOMAUTOAIMING_MAXDIST    (9000.0f)
 
-enum eWeaponType
-{
-	WEAPONTYPE_UNARMED,
-	WEAPONTYPE_BASEBALLBAT,
-	WEAPONTYPE_COLT45,
-	WEAPONTYPE_UZI,
-	WEAPONTYPE_SHOTGUN,
-	WEAPONTYPE_AK47,
-	WEAPONTYPE_M16,
-	WEAPONTYPE_SNIPERRIFLE,
-	WEAPONTYPE_ROCKETLAUNCHER,
-	WEAPONTYPE_FLAMETHROWER,
-	WEAPONTYPE_MOLOTOV,
-	WEAPONTYPE_GRENADE,
-	WEAPONTYPE_DETONATOR,
-	WEAPONTYPE_HELICANNON,
-	WEAPONTYPE_LAST_WEAPONTYPE,
-	WEAPONTYPE_ARMOUR,
-	WEAPONTYPE_RAMMEDBYCAR,
-	WEAPONTYPE_RUNOVERBYCAR,
-	WEAPONTYPE_EXPLOSION,
-	WEAPONTYPE_UZI_DRIVEBY,
-	WEAPONTYPE_DROWNING,
-	WEAPONTYPE_FALL,
-	WEAPONTYPE_UNIDENTIFIED,
-	
-	WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE,
-	WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13,
-};
-
-enum eWeaponFire {
-	WEAPON_FIRE_MELEE,
-	WEAPON_FIRE_INSTANT_HIT,
-	WEAPON_FIRE_PROJECTILE,
-	WEAPON_FIRE_AREA_EFFECT,
-	WEAPON_FIRE_USE
-};
-
-// Taken from MTA SA, seems it's unchanged
-enum eWeaponState
-{
-	WEAPONSTATE_READY,
-	WEAPONSTATE_FIRING,
-	WEAPONSTATE_RELOADING,
-	WEAPONSTATE_OUT_OF_AMMO,
-	WEAPONSTATE_MELEE_MADECONTACT
-};
-
 class CEntity;
 class CPhysical;
 class CAutomobile;
-- 
cgit v1.2.3