X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.h;h=ab1552595bca018ae5694b593aaf93c56e5f07c7;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=b8623698f5734715b3818c0fe6d375fa9a1b437c;hpb=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.h b/src/battle/states/PerformAttacks.h
index b862369..ab15525 100644
--- a/src/battle/states/PerformAttacks.h
+++ b/src/battle/states/PerformAttacks.h
@@ -1,17 +1,10 @@
-/*
- * PerformAttacks.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_PERFORMATTACKS_H_
 #define BATTLE_PERFORMATTACKS_H_
 
 #include "../../app/State.h"
 
 #include "../NumberAnimation.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 #include "../../graphics/Animation.h"
 
 #include <vector>
@@ -30,7 +23,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:
@@ -49,9 +42,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;
@@ -61,11 +54,11 @@ 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;
 
 };
 
 }
 
-#endif /* BATTLE_PERFORMATTACKS_H_ */
+#endif