converted equipment from explicit members to array

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

diff --git a/src/common/Item.h b/src/common/Item.h
index bd8e7a999e720875e09e3b5a277671da9942b263..06c0f83588d9ca8e9bc4d95dfc29a7a9f8f98a27 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"
 
@@ -92,12 +93,12 @@ public:
 private:
        enum Equipable {
                EQUIPPABLE_NONE = 0,
-               EQUIPPABLE_WEAPON = 1,
-               EQUIPPABLE_ARMOR = 2,
-               EQUIPPABLE_SHIELD = 4,
-               EQUIPPABLE_HELMET = 8,
-               EQUIPPABLE_RING = 16,
-               EQUIPPABLE_JEWEL = 32,
+               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,