summaryrefslogtreecommitdiffstats
path: root/src/weapons
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-07-06 00:44:49 +0200
committereray orçunus <erayorcunus@gmail.com>2019-07-06 00:44:49 +0200
commit0e7a471b82129bcdea3f691744ed8db4717c3153 (patch)
treeed6e7b7e1dbbc68da64eb1b2f8d70c7367aad572 /src/weapons
parentfixed rand (thanks nick) (diff)
downloadre3-0e7a471b82129bcdea3f691744ed8db4717c3153.tar
re3-0e7a471b82129bcdea3f691744ed8db4717c3153.tar.gz
re3-0e7a471b82129bcdea3f691744ed8db4717c3153.tar.bz2
re3-0e7a471b82129bcdea3f691744ed8db4717c3153.tar.lz
re3-0e7a471b82129bcdea3f691744ed8db4717c3153.tar.xz
re3-0e7a471b82129bcdea3f691744ed8db4717c3153.tar.zst
re3-0e7a471b82129bcdea3f691744ed8db4717c3153.zip
Diffstat (limited to 'src/weapons')
-rw-r--r--src/weapons/Weapon.cpp6
-rw-r--r--src/weapons/Weapon.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index 0c48db6b..90a6408b 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -35,6 +35,12 @@ CWeapon::Reload(void)
m_nAmmoInClip = m_nAmmoTotal;
}
+bool
+CWeapon::IsTypeMelee(void)
+{
+ return m_eWeaponType == WEAPONTYPE_UNARMED || m_eWeaponType == WEAPONTYPE_BASEBALLBAT;
+}
+
STARTPATCHES
InjectHook(0x55C330, &CWeapon::Initialise, PATCH_JUMP);
InjectHook(0x5639D0, &CWeapon::Reload, PATCH_JUMP);
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index 8cb435ce..ba552035 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -58,5 +58,6 @@ public:
void Reload(void);
bool Fire(CEntity*, CVector*);
void AddGunshell(CEntity*, CVector const&, CVector2D const&, float);
+ bool IsTypeMelee(void);
};
static_assert(sizeof(CWeapon) == 0x18, "CWeapon: error");