added inventory menu to EquipMenu

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

diff --git a/src/common/Item.h b/src/common/Item.h
index bd8e7a999e720875e09e3b5a277671da9942b263..df361fe97cdec1a80038bbc1046bc1a74a51aeb4 100644 (file)
--- a/src/common/Item.h
+++ b/src/common/Item.h
@@ -9,6 +9,7 @@
 #define COMMON_ITEM_H_
 
 #include "fwd.h"
+#include "Hero.h"
 #include "TargetingMode.h"
 #include "../graphics/fwd.h"
 
@@ -53,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; }
 
@@ -90,15 +86,6 @@ public:
        static void Construct(void *);
 
 private:
-       enum Equipable {
-               EQUIPPABLE_NONE = 0,
-               EQUIPPABLE_WEAPON = 1,
-               EQUIPPABLE_ARMOR = 2,
-               EQUIPPABLE_SHIELD = 4,
-               EQUIPPABLE_HELMET = 8,
-               EQUIPPABLE_RING = 16,
-               EQUIPPABLE_JEWEL = 32,
-       };
        enum Property {
                PROPERTY_HAS_EFFECT_STATUS = 1,
                PROPERTY_HAS_EFFECT_BATTLE = 2,