From 194ddc5f40835476673655bd3895f2b7fe7fee0c Mon Sep 17 00:00:00 2001
From: Fire-Head <Fire-Head@users.noreply.github.com>
Date: Sat, 28 Mar 2020 23:55:23 +0300
Subject: CWeaponEffects(autoaim crosshair) done, CGame done. restored some
 original R* names

---
 src/weapons/Weapon.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index 1db66720..74145564 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -15,17 +15,19 @@ enum eWeaponType
 	WEAPONTYPE_MOLOTOV,
 	WEAPONTYPE_GRENADE,
 	WEAPONTYPE_DETONATOR,
-	WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13,
-	WEAPONTYPE_HELICANNON = 13,
-	WEAPONTYPE_TOTALWEAPONS,
+	WEAPONTYPE_HELICANNON,
+	WEAPONTYPE_LAST_WEAPONTYPE,
 	WEAPONTYPE_ARMOUR,
 	WEAPONTYPE_RAMMEDBYCAR,
 	WEAPONTYPE_RUNOVERBYCAR,
 	WEAPONTYPE_EXPLOSION,
 	WEAPONTYPE_UZI_DRIVEBY,
-	WEAPONTYPE_WATER,
-	WEAPONTYPE_FALL_DAMAGE,
+	WEAPONTYPE_DROWNING,
+	WEAPONTYPE_FALL,
 	WEAPONTYPE_UNIDENTIFIED,
+	
+	WEAPONTYPE_TOTALWEAPONS = WEAPONTYPE_LAST_WEAPONTYPE,
+	WEAPONTYPE_TOTAL_INVENTORY_WEAPONS = 13,
 };
 
 enum eWeaponFire {
@@ -63,6 +65,7 @@ public:
 		m_bAddRotOffset = false;
 	}
 
+	static void ShutdownWeapons(void);
 	void Initialise(eWeaponType type, int ammo);
 	void Update(int32 audioEntity);
 	void Reload(void);
-- 
cgit v1.2.3