X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=de20f76cbeaa267ccd5f6a08eb96f0a3094f4dce;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=06ce1b89cd93329719988b561b272fcf1c6982e9;hpb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index 06ce1b8..de20f76 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 {
 
@@ -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;
 
 };