diff options
Diffstat (limited to 'src/game/Player.h')
| -rw-r--r-- | src/game/Player.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/Player.h b/src/game/Player.h index 10b31632415..e709e8c8169 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1180,7 +1180,11 @@ class TRINITY_DLL_SPEC Player : public Unit void AddArmorProficiency(uint32 newflag) { m_ArmorProficiency |= newflag; } uint32 GetWeaponProficiency() const { return m_WeaponProficiency; } uint32 GetArmorProficiency() const { return m_ArmorProficiency; } - bool IsInFeralForm() const { return m_form == FORM_CAT || m_form == FORM_BEAR || m_form == FORM_DIREBEAR; } + bool IsUseEquipedWeapon( bool mainhand ) const + { + // disarm applied only to mainhand weapon + return !IsInFeralForm() && (!mainhand || !HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISARMED) ); + } bool IsTwoHandUsed() const { Item* mainItem = GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND); |