From 5357957fe124afb8e9a5f737510fe4c96a7dc327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?eray=20or=C3=A7unus?= <erayorcunus@gmail.com>
Date: Sat, 23 May 2020 16:53:20 +0300
Subject: Compatibility with VC weapon.dat + new shotguns

---
 src/weapons/WeaponType.h | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

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

diff --git a/src/weapons/WeaponType.h b/src/weapons/WeaponType.h
index 4b8be40f..65d715ec 100644
--- a/src/weapons/WeaponType.h
+++ b/src/weapons/WeaponType.h
@@ -1,6 +1,5 @@
 #pragma once
 
-// --MIAMI: TODO
 enum eWeaponType
 {
 	WEAPONTYPE_UNARMED,
@@ -17,23 +16,31 @@ enum eWeaponType
 	WEAPONTYPE_CHAINSAW,
 	WEAPONTYPE_GRENADE,
 	WEAPONTYPE_DETONATOR_GRENADE,
+	WEAPONTYPE_TEARGAS,
 	WEAPONTYPE_MOLOTOV,
 	WEAPONTYPE_ROCKET,
 	WEAPONTYPE_COLT45,
+	WEAPONTYPE_PYTHON,
 	WEAPONTYPE_SHOTGUN,
+	WEAPONTYPE_SPAS12_SHOTGUN,
+	WEAPONTYPE_STUBBY_SHOTGUN,
 	WEAPONTYPE_TEC9,
 	WEAPONTYPE_UZI,
 	WEAPONTYPE_SILENCED_INGRAM,
 	WEAPONTYPE_MP5,
-	WEAPONTYPE_M16,
-	WEAPONTYPE_AK47,
+	WEAPONTYPE_M4,
+	WEAPONTYPE_RUGER,
 	WEAPONTYPE_SNIPERRIFLE,
+	WEAPONTYPE_LASERSCOPE,
 	WEAPONTYPE_ROCKETLAUNCHER,
 	WEAPONTYPE_FLAMETHROWER,
+	WEAPONTYPE_M60,
+	WEAPONTYPE_MINIGUN,
 	WEAPONTYPE_DETONATOR,
 	WEAPONTYPE_HELICANNON,
-	WEAPONTYPE_LAST_WEAPONTYPE,
-	WEAPONTYPE_HEALTH,
+	WEAPONTYPE_CAMERA,
+	WEAPONTYPE_TOTALWEAPONS = 37,
+	WEAPONTYPE_HEALTH = 37,
 	WEAPONTYPE_ARMOUR,
 	WEAPONTYPE_RAMMEDBYCAR,
 	WEAPONTYPE_RUNOVERBYCAR,
@@ -42,10 +49,8 @@ enum eWeaponType
 	WEAPONTYPE_DROWNING,
 	WEAPONTYPE_FALL,
 	WEAPONTYPE_UNIDENTIFIED,
-	
-	WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE,
-	WEAPONTYPE_ANYMELEE = 46,
-	WEAPONTYPE_ANYWEAPON = 47
+	WEAPONTYPE_ANYMELEE,
+	WEAPONTYPE_ANYWEAPON
 };
 
 enum {
@@ -57,7 +62,7 @@ enum eWeaponFire {
 	WEAPON_FIRE_INSTANT_HIT,
 	WEAPON_FIRE_PROJECTILE,
 	WEAPON_FIRE_AREA_EFFECT,
-	WEAPON_FIRE_USE
+	WEAPON_FIRE_CAMERA
 };
 
 // Taken from MTA SA, seems it's unchanged
-- 
cgit v1.2.3