X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FItem.h;h=df361fe97cdec1a80038bbc1046bc1a74a51aeb4;hb=590f468d34edb704de415d05d51f087da106a547;hp=eb60891636e9cb22acd87d5867b372d17afc0db8;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git

diff --git a/src/common/Item.h b/src/common/Item.h
index eb60891..df361fe 100644
--- a/src/common/Item.h
+++ b/src/common/Item.h
@@ -9,7 +9,7 @@
 #define COMMON_ITEM_H_
 
 #include "fwd.h"
-#include "HeroGroup.h"
+#include "Hero.h"
 #include "TargetingMode.h"
 #include "../graphics/fwd.h"
 
@@ -19,6 +19,9 @@ namespace common {
 
 class Item {
 
+public:
+	static const int TYPE_ID = 303;
+
 public:
 	Item();
 
@@ -26,7 +29,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; }
@@ -51,15 +54,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; }
@@ -75,6 +72,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; }
@@ -87,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,
@@ -126,12 +116,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;