X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=da2c86662de617210c982357f41bb1c00a618bad;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=5e86f88dae783da4f8dbaf47d1666e32568fb82c;hpb=350055a7ff27c74882aff8a4d6af2014782f830b;p=l2e.git diff --git a/src/battle/Hero.h b/src/battle/Hero.h index 5e86f88..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" @@ -76,8 +69,8 @@ public: const graphics::Animation *AttackAnimation() const { return master->AttackAnimation(); } const graphics::Animation *SpellAnimation() const { return master->SpellAnimation(); } - geometry::Vector &Position() { return position; } - const geometry::Vector &Position() const { return position; } + math::Vector &Position() { return position; } + const math::Vector &Position() const { return position; } graphics::Menu &SpellMenu() { return spellMenu; } const graphics::Menu &SpellMenu() const { return spellMenu; } @@ -96,7 +89,7 @@ private: graphics::AnimationRunner animation; - geometry::Vector position; + math::Vector position; graphics::Menu spellMenu; graphics::Menu ikariMenu;