X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.h;h=7cf5e715e521ad1ad916b46c8a124991a6353327;hb=42fea5412a4423e827aac36465b2d9a38968390e;hp=7af5461020c1439fa10ccc6f578404730144f0db;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index 7af5461..7cf5e71 100644
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -1,16 +1,12 @@
-/*
- * RunState.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_RUNSTATE_H_
 #define BATTLE_RUNSTATE_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,30 +15,33 @@ class RunState
 
 public:
 	explicit RunState(BattleState *battle)
-	: ctrl(0), battle(battle){ }
+	: battle(battle) { }
 
 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:
-	void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	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 RenderTitleBar(SDL_Surface *screen);
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
 	app::Timer<Uint32> timer;
+	math::Vector<int> framePosition;
+	math::Vector<int> frameSize;
+	math::Vector<int> textPosition;
 
 };
 
 }
 
-#endif /* BATTLE_RUNSTATE_H_ */
+#endif