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

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index d719288..da2c866 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_
 
@@ -13,7 +6,7 @@
 #include "../common/fwd.h"
 #include "../common/Hero.h"
 #include "../common/Stats.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Animation.h"
 #include "../graphics/fwd.h"
 #include "../graphics/Menu.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; }
@@ -83,8 +69,8 @@ public:
 	const graphics::Animation *AttackAnimation() const { return master->AttackAnimation(); }
 	const graphics::Animation *SpellAnimation() const { return master->SpellAnimation(); }
 
-	geometry::Vector<int> &Position() { return position; }
-	const geometry::Vector<int> &Position() const { return position; }
+	math::Vector<int> &Position() { return position; }
+	const math::Vector<int> &Position() const { return position; }
 
 	graphics::Menu<const common::Spell *> &SpellMenu() { return spellMenu; }
 	const graphics::Menu<const common::Spell *> &SpellMenu() const { return spellMenu; }
@@ -103,7 +89,7 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	geometry::Vector<int> position;
+	math::Vector<int> position;
 
 	graphics::Menu<const common::Spell *> spellMenu;
 	graphics::Menu<const common::Item *> ikariMenu;