X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.h;h=7cf5e715e521ad1ad916b46c8a124991a6353327;hb=9a7ac49b7e3b7cd4a09b016ceec116830a3458f9;hp=cf91f9ab47796eb0659223093526b3f0a61d6bb0;hpb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;p=l2e.git

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index cf91f9a..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,12 +15,11 @@ class RunState
 
 public:
 	explicit RunState(BattleState *battle)
-	: battle(battle){ }
+	: battle(battle) { }
 
 public:
-
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
@@ -36,14 +31,17 @@ private:
 	virtual void OnResize(int width, int height);
 
 private:
-	void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderTitleBar(SDL_Surface *screen);
 
 private:
 	BattleState *battle;
 	app::Timer<Uint32> timer;
+	math::Vector<int> framePosition;
+	math::Vector<int> frameSize;
+	math::Vector<int> textPosition;
 
 };
 
 }
 
-#endif /* BATTLE_RUNSTATE_H_ */
+#endif