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.cpp |  1 +
 src/weapons/Weapon.h   | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/weapons')

diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index 8019a1cf..09844c23 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -6,6 +6,7 @@
 #include "Ped.h"
 #include "World.h"
 
+WRAPPER void CWeapon::ShutdownWeapons(void) { EAXJMP(0x55C2F0); }
 WRAPPER void CWeapon::UpdateWeapons(void) { EAXJMP(0x55C310); }
 WRAPPER bool CWeapon::Fire(CEntity*, CVector*) { EAXJMP(0x55C380); }
 WRAPPER void CWeapon::FireFromCar(CAutomobile *car, bool left) { EAXJMP(0x55C940); }
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


From 97ffa1a6584fb9da20386dda6c171c00c937272b Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 29 Mar 2020 08:54:34 +0300
Subject: Wrappers cleanup

---
 src/weapons/Explosion.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/weapons')

diff --git a/src/weapons/Explosion.cpp b/src/weapons/Explosion.cpp
index 05087335..e99dc918 100644
--- a/src/weapons/Explosion.cpp
+++ b/src/weapons/Explosion.cpp
@@ -6,8 +6,6 @@
 CExplosion(&gaExplosion)[48] = *(CExplosion(*)[48])*(uintptr*)0x64E208;
 
 WRAPPER void CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32) { EAXJMP(0x5591C0); }
-//WRAPPER void CExplosion::RemoveAllExplosionsInArea(CVector, float) { EAXJMP(0x55AD40); }
-//WRAPPER bool CExplosion::TestForExplosionInArea(eExplosionType, float, float, float, float, float, float) { EAXJMP(0x55AC80); }
 
 int AudioHandle = AEHANDLE_NONE;
 
-- 
cgit v1.2.3