diff options
| author | aap <aap@papnet.eu> | 2019-07-06 00:58:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 00:58:07 +0200 |
| commit | 2d086961909d25c8f863fdfc6d7af8295db574d7 (patch) | |
| tree | 4c1f659bf8885da09d0a2bca1a1e0eebb444f91a /src/weapons | |
| parent | Merge pull request #112 from guard3/master (diff) | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| download | re3-2d086961909d25c8f863fdfc6d7af8295db574d7.tar re3-2d086961909d25c8f863fdfc6d7af8295db574d7.tar.gz re3-2d086961909d25c8f863fdfc6d7af8295db574d7.tar.bz2 re3-2d086961909d25c8f863fdfc6d7af8295db574d7.tar.lz re3-2d086961909d25c8f863fdfc6d7af8295db574d7.tar.xz re3-2d086961909d25c8f863fdfc6d7af8295db574d7.tar.zst re3-2d086961909d25c8f863fdfc6d7af8295db574d7.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/weapons/Weapon.cpp | 6 | ||||
| -rw-r--r-- | src/weapons/Weapon.h | 1 |
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"); |