X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.h;h=1f98772a1952e208844c422c38f6d5c0761ed457;hb=dc275497c592669dda75645604a9b35d32f63e90;hp=07dba7105f709a03dc97fdee9119ade14d24d712;hpb=62c0a1d0ac98eb51418e4daa59e80b6cc97b522f;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 07dba71..1f98772 100644
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -1,40 +1,37 @@
-/*
- * SwapHeroes.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SWAPHEROES_H_
 #define BATTLE_SWAPHEROES_H_
 
+namespace battle {
+	class BattleState;
+	class SelectMoveAction;
+}
+
 #include "../../app/State.h"
+#include "../../math/Vector.h"
 
-#include "../../geometry/Vector.h"
+#include <vector>
 
 namespace battle {
 
-class BattleState;
-class SelectMoveAction;
-
 class SwapHeroes
 : public app::State {
 
 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 EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void HandleEvents(const app::Input &);
+	virtual void UpdateWorld(Uint32 deltaT);
+	virtual void Render(SDL_Surface *);
 
-	virtual void Resize(int width, int height);
+private:
+	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 HandleInput(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
-	virtual void Render(SDL_Surface *);
+	virtual void OnResize(int width, int height);
 
 private:
 	void MoveUp();
@@ -43,12 +40,14 @@ private:
 	void MoveLeft();
 
 private:
-	void RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderCursors(SDL_Surface *screen);
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
 	SelectMoveAction *parent;
+	std::vector<math::Vector<int> > positions;
+	math::Vector<int> cursorOffset;
+	math::Vector<int> indicatorOffset;
 	int cursor;
 	int selected;
 	bool flipFlop;
@@ -57,4 +56,4 @@ private:
 
 }
 
-#endif /* BATTLE_SWAPHEROES_H_ */
+#endif