added inventory menu to EquipMenu

[l2e.git] / src / common / Item.h

diff --git a/src/common/Item.h b/src/common/Item.h
index 06c0f83588d9ca8e9bc4d95dfc29a7a9f8f98a27..df361fe97cdec1a80038bbc1046bc1a74a51aeb4 100644 (file)
--- a/src/common/Item.h
+++ b/src/common/Item.h
@@ -54,12 +54,7 @@ public:
 
        Uint16 Value() const { return value; }
 
-       bool CanEquipWeapon() const { return equipability & EQUIPPABLE_WEAPON; }
-       bool CanEquipArmor() const { return equipability & EQUIPPABLE_ARMOR; }
-       bool CanEquipShield() const { return equipability & EQUIPPABLE_SHIELD; }
-       bool CanEquipHelmet() const { return equipability & EQUIPPABLE_HELMET; }
-       bool CanEquipRing() const { return equipability & EQUIPPABLE_RING; }
-       bool CanEquipJewel() const { return equipability & EQUIPPABLE_JEWEL; }
+       bool EquipableAt(Hero::EquipSlot slot) const { return equipability & (1 << slot); }
 
        int HeroMask() const { return heroMask; }
 
@@ -91,15 +86,6 @@ public:
        static void Construct(void *);
 
 private:
-       enum Equipable {
-               EQUIPPABLE_NONE = 0,
-               EQUIPPABLE_WEAPON = 1 << Hero::EQUIP_WEAPON,
-               EQUIPPABLE_ARMOR = 1 << Hero::EQUIP_ARMOR,
-               EQUIPPABLE_SHIELD = 1 << Hero::EQUIP_SHIELD,
-               EQUIPPABLE_HELMET = 1 << Hero::EQUIP_HELMET,
-               EQUIPPABLE_RING = 1 << Hero::EQUIP_RING,
-               EQUIPPABLE_JEWEL = 1 << Hero::EQUIP_JEWEL,
-       };
        enum Property {
                PROPERTY_HAS_EFFECT_STATUS = 1,
                PROPERTY_HAS_EFFECT_BATTLE = 2,