X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=c15c2dcbc08bf4d25cc73f7b0734b54ef4463760;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=74449026f93efe706ac469222d895e6194808517;hpb=cded7d136b41e22f363ec702f2288491c0006e3a;p=l2e.git diff --git a/src/battle/Hero.h b/src/battle/Hero.h index 7444902..c15c2dc 100644 --- a/src/battle/Hero.h +++ b/src/battle/Hero.h @@ -10,7 +10,7 @@ #include "AttackChoice.h" #include "Stats.h" -#include "../geometry/Point.h" +#include "../geometry/Vector.h" #include "../graphics/Animation.h" #include "../graphics/Menu.h" @@ -88,8 +88,8 @@ public: const graphics::Animation *AttackAnimation() const { return attackAnimation; } const graphics::Animation *SpellAnimation() const { return spellAnimation; } - geometry::Point &Position() { return position; } - const geometry::Point &Position() const { return position; } + geometry::Vector &Position() { return position; } + const geometry::Vector &Position() const { return position; } graphics::Menu &SpellMenu() { return spellMenu; } const graphics::Menu &SpellMenu() const { return spellMenu; } @@ -130,6 +130,9 @@ public: void SetAttackAnimation(const graphics::Animation *a) { attackAnimation = a; } void SetSpellAnimation(const graphics::Animation *a) { spellAnimation = a; } + static void CreateTypeDescription(); + static void Construct(void *); + private: const char *name; graphics::Sprite *sprite; @@ -147,7 +150,7 @@ private: graphics::AnimationRunner animation; - geometry::Point position; + geometry::Vector position; graphics::Menu spellMenu; graphics::Menu ikariMenu; @@ -157,13 +160,13 @@ private: // TODO: vector does not seem to be a good choice std::vector spells; - Uint16 maxHealth, health; - Uint16 maxMana, mana; + int maxHealth, health; + int maxMana, mana; Stats stats; - Uint8 level; - Uint8 ip; + int level; + int ip; };