X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.h;h=14d0d723c9611dca6a96db884a2ed0b6135329b3;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=a5f5c62379399043f0148988068c52439e0ff392;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index a5f5c62..14d0d72 100644
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -10,7 +10,7 @@
 
 #include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,7 +19,7 @@ class SwapHeroes
 
 public:
 	SwapHeroes(BattleState *battle, SelectMoveAction *parent)
-	: ctrl(0), battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
+	: battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
 
 public:
 	virtual void HandleEvents(const app::Input &);
@@ -27,10 +27,10 @@ public:
 	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);
 
@@ -41,10 +41,9 @@ private:
 	void MoveLeft();
 
 private:
-	void RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
 	SelectMoveAction *parent;
 	int cursor;