X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=adbf3ba8f7e84b80399dd3b5ad4a7e34bd7c9d04;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=2fe9a06b9c5d31367d08d32489152a21a07b4747;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index 2fe9a06..adbf3ba 100644
--- 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,14 +30,14 @@ public:
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
-	virtual void OnEnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnEnterState(SDL_Surface *screen);
+	virtual void OnExitState(SDL_Surface *screen);
+	virtual void OnResumeState(SDL_Surface *screen);
+	virtual void OnPauseState(SDL_Surface *screen);
 
 	virtual void OnResize(int width, int height);
 
@@ -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;
 
 };