removed lazy fwd headers

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

diff --git a/src/common/Item.h b/src/common/Item.h
index 279235572768662e820ea60b3fd15533f31a099a..bacdfb090614f37956062327d27a1e75f58a25c7 100644 (file)
--- a/src/common/Item.h
+++ b/src/common/Item.h
@@ -1,17 +1,16 @@
-/*
- * Item.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef COMMON_ITEM_H_
 #define COMMON_ITEM_H_
 
-#include "fwd.h"
-#include "HeroGroup.h"
+namespace common {
+       class Ikari;
+}
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
+
+#include "Hero.h"
 #include "TargetingMode.h"
-#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
@@ -29,7 +28,7 @@ public:
        const char *Name() const { return name; }
 
        bool IsMostUseful() const { return mostUseful; }
-       bool IsEquipable() const { return equipable; }
+       bool IsEquipable() const { return equipability; }
        bool IsCursed() const { return cursed; }
        bool IsFruit() const { return fruit; }
        bool IsScenario() const { return scenario; }
@@ -54,15 +53,9 @@ 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); }
 
-       HeroGroup &EquipableBy() { return equipableBy; }
-       const HeroGroup &EquipableBy() const { return equipableBy; }
+       int HeroMask() const { return heroMask; }
 
        bool HasEffectOnStatusScreen() const { return properties & PROPERTY_HAS_EFFECT_STATUS; }
        bool HasEffectInBattle() const { return properties & PROPERTY_HAS_EFFECT_BATTLE; }
@@ -78,6 +71,8 @@ public:
        bool HasBattleAnimation() const { return properties & PROPERTY_HAS_BATTLE_ANIMATION; }
        bool HasIkariEffect() const { return properties & PROPERTY_HAS_IKARI_EFFECT; }
 
+       static bool Less(const Item &, const Item &);
+
 // temporary setters
 public:
        void SetName(const char *n) { name = n; }
@@ -90,15 +85,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,
@@ -129,12 +115,11 @@ private:
        Uint16 properties;
 
        TargetingMode targettingMode;
-       Uint8 equipability;
-       HeroGroup equipableBy;
+       int equipability;
+       int heroMask;
 
        // TODO: turn these back into bits as soon as fields are implemented in the loader
        bool mostUseful;
-       bool equipable;
        bool cursed;
        bool fruit;
        bool scenario;