X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=bf02f0309ee5865cf2efae1735dfcabb0c6ad629;hb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;hp=d719288b376f2e687e64c5f5924c204483d696a4;hpb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index d719288..bf02f03 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -1,10 +1,3 @@
-/*
- * Hero.h
- *
- *  Created on: Aug 6, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
@@ -54,26 +47,19 @@ 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(); }
+	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; }