X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=1ec41406a6bb17347fc8228f423c6e7e215bca9e;hb=1338442a6db3a706d09622188aad1cdfe183a70b;hp=d719288b376f2e687e64c5f5924c204483d696a4;hpb=5795ffa948c6e39a624c4fc7773a99afb87579e1;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index d719288..1ec4140 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -54,26 +54,26 @@ public:
 	common::Stats &GetStats() { return stats; }
 	const common::Stats &GetStats() const { return stats; }
 
-	common::Item *Weapon() { return master->Weapon(); }
-	common::Item *Armor() { return master->Armor(); }
-	common::Item *Shield() { return master->Shield(); }
-	common::Item *Helmet() { return master->Helmet(); }
-	common::Item *Ring() { return master->Ring(); }
-	common::Item *Jewel() { return master->Jewel(); }
-
-	const common::Item *Weapon() const { return master->Weapon(); }
-	const common::Item *Armor() const { return master->Armor(); }
-	const common::Item *Shield() const { return master->Shield(); }
-	const common::Item *Helmet() const { return master->Helmet(); }
-	const common::Item *Ring() const { return master->Ring(); }
-	const common::Item *Jewel() const { return master->Jewel(); }
-
-	bool HasWeapon() const { return master->HasWeapon(); }
-	bool HasArmor() const { return master->HasArmor(); }
-	bool HasShield() const { return master->HasShield(); }
-	bool HasHelmet() const { return master->HasHelmet(); }
-	bool HasRing() const { return master->HasRing(); }
-	bool HasJewel() const { return master->HasJewel(); }
+	common::Item *Weapon() { return master->Equipment(common::Hero::EQUIP_WEAPON); }
+	common::Item *Armor() { return master->Equipment(common::Hero::EQUIP_ARMOR); }
+	common::Item *Shield() { return master->Equipment(common::Hero::EQUIP_SHIELD); }
+	common::Item *Helmet() { return master->Equipment(common::Hero::EQUIP_HELMET); }
+	common::Item *Ring() { return master->Equipment(common::Hero::EQUIP_RING); }
+	common::Item *Jewel() { return master->Equipment(common::Hero::EQUIP_JEWEL); }
+
+	const common::Item *Weapon() const { return master->Equipment(common::Hero::EQUIP_WEAPON); }
+	const common::Item *Armor() const { return master->Equipment(common::Hero::EQUIP_ARMOR); }
+	const common::Item *Shield() const { return master->Equipment(common::Hero::EQUIP_SHIELD); }
+	const common::Item *Helmet() const { return master->Equipment(common::Hero::EQUIP_HELMET); }
+	const common::Item *Ring() const { return master->Equipment(common::Hero::EQUIP_RING); }
+	const common::Item *Jewel() const { return master->Equipment(common::Hero::EQUIP_JEWEL); }
+
+	bool HasWeapon() const { return master->Equipped(common::Hero::EQUIP_WEAPON); }
+	bool HasArmor() const { return master->Equipped(common::Hero::EQUIP_ARMOR); }
+	bool HasShield() const { return master->Equipped(common::Hero::EQUIP_SHIELD); }
+	bool HasHelmet() const { return master->Equipped(common::Hero::EQUIP_HELMET); }
+	bool HasRing() const { return master->Equipped(common::Hero::EQUIP_RING); }
+	bool HasJewel() const { return master->Equipped(common::Hero::EQUIP_JEWEL); }
 
 	graphics::AnimationRunner &GetAnimation() { return animation; }
 	const graphics::AnimationRunner &GetAnimation() const { return animation; }