X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.h;h=156eec16cbec2e22b5ff3647debda3165bfb733d;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=bb04fb51e3a20cc1700236c571179dd76c33c329;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index bb04fb5..156eec1 100644
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -1,16 +1,15 @@
-/*
- * SelectMoveAction.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
-#include "../fwd.h"
+namespace battle {
+	class Battle;
+	class BattleState;
+	class HeroTag;
+	struct Resources;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -18,31 +17,37 @@ class SelectMoveAction
 : public app::State {
 
 public:
-	explicit SelectMoveAction(BattleState *battle)
-	: ctrl(0), battle(battle) { }
+	SelectMoveAction(Battle *battle, BattleState *parent);
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
+public:
+	const Resources &Res() const;
+	const math::Vector<int> &ScreenOffset() const;
+	const HeroTag &HeroTagAt(int index) const;
+	const math::Vector<int> &HeroTagPositionAt(int index) const;
+
 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);
 
 private:
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderMenu(SDL_Surface *screen);
 
 private:
-	app::Application *ctrl;
-	BattleState *battle;
+	Battle *battle;
+	BattleState *parent;
+	math::Vector<int> position;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTMOVEACTION_H_ */
+#endif