X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FCapsule.h;h=dc2ac6e994826bd4e7357a9fa9b6180e6d26c5a3;hb=0b11a24a8b08c49d6e4301573602fb6d01e7a8c8;hp=7438492bc7f86a7046b999fc42ee4fb8e8755b18;hpb=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;p=l2e.git diff --git a/src/battle/Capsule.h b/src/battle/Capsule.h index 7438492..dc2ac6e 100644 --- a/src/battle/Capsule.h +++ b/src/battle/Capsule.h @@ -4,14 +4,18 @@ namespace common { class Capsule; } +namespace math { + template + class Vector; +} #include "AttackChoice.h" #include "../common/Stats.h" -#include "../geometry/Vector.h" #include "../graphics/Animation.h" -#include "../graphics/fwd.h" #include "../graphics/Menu.h" +#include + namespace battle { class Capsule { @@ -42,8 +46,8 @@ public: const graphics::Animation *AttackAnimation() const; const graphics::Animation *SpellAnimation() const; - geometry::Vector &Position() { return position; } - const geometry::Vector &Position() const { return position; } + math::Vector &Position() { return position; } + const math::Vector &Position() const { return position; } AttackChoice &GetAttackChoice() { return attackChoice; } const AttackChoice &GetAttackChoice() const { return attackChoice; } @@ -54,7 +58,7 @@ private: int health; graphics::AnimationRunner animation; - geometry::Vector position; + math::Vector position; AttackChoice attackChoice; common::Stats stats; @@ -62,4 +66,4 @@ private: } -#endif /* BATTLE_CAPSULE_H_ */ +#endif