removed lazy fwd headers

[l2e.git] / src / battle / states / PerformAttacks.h

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index 06ce1b89cd93329719988b561b272fcf1c6982e9..adbf3ba8f7e84b80399dd3b5ad4a7e34bd7c9d04 100644 (file)
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -10,15 +10,17 @@
 
 #include "../../app/State.h"
 
-#include "../BattleState.h"
 #include "../NumberAnimation.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 #include "../../graphics/Animation.h"
 
 #include <vector>
 
 namespace battle {
 
+class BattleState;
+class TargetSelection;
+
 class PerformAttacks
 : public app::State {
 
@@ -28,7 +30,7 @@ public:
 
 public:
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
 private:
@@ -47,9 +49,9 @@ private:
 private:
        void AddNumberAnimations(const TargetSelection &);
 
-       void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderNumbers(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-       void RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+       void RenderTitleBar(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderNumbers(SDL_Surface *screen, const math::Vector<int> &offset) const;
+       void RenderTargetAnimation(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
 private:
        BattleState *battle;
@@ -59,7 +61,7 @@ private:
        app::Timer<Uint32> titleBarTimer;
        app::Timer<Uint32> targetAnimationTimer;
        std::vector<NumberAnimation> numberAnimation;
-       std::vector<geometry::Vector<int> > numberPosition;
+       std::vector<math::Vector<int> > numberPosition;
        int cursor;
 
 };