X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.h;h=d1b4d923e48c4723c57ecf0348c3ae53c5178d10;hb=8f4e771181491f1d83ce0c907b8dda0fbbe0ce93;hp=109a1f015ba3caa47e67addee8e825d62fce6c86;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 109a1f0..d1b4d92 100644
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -1,41 +1,37 @@
-/*
- * SwapHeroes.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SWAPHEROES_H_
 #define BATTLE_SWAPHEROES_H_
 
+namespace battle {
+	class Battle;
+	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) { }
+	SwapHeroes(Battle *battle, SelectMoveAction *parent);
 
 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 Resize(int width, int height);
-
 	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(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);
+
 private:
 	void MoveUp();
 	void MoveRight();
@@ -43,12 +39,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;
+	Battle *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 +55,4 @@ private:
 
 }
 
-#endif /* BATTLE_SWAPHEROES_H_ */
+#endif