X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTransitionState.h;h=9a73ae5c3019385a92257d9944e2a8fdaac6d218;hb=e1dab8a680a76f8621e967a693dbf2b481ba8f75;hp=2a99f1adc8beaa82585aa04263a546b5203cca06;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/map/TransitionState.h b/src/map/TransitionState.h
index 2a99f1a..9a73ae5 100644
--- a/src/map/TransitionState.h
+++ b/src/map/TransitionState.h
@@ -1,16 +1,16 @@
-/*
- * TransitionState.h
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #ifndef MAP_TRANSITIONSTATE_H_
 #define MAP_TRANSITIONSTATE_H_
 
-#include "fwd.h"
+namespace map {
+	class Map;
+	class MapState;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+
 #include "../app/State.h"
-#include "../geometry/Vector.h"
 
 namespace map {
 
@@ -18,29 +18,29 @@ class TransitionState
 : public app::State {
 
 public:
-	TransitionState(MapState *, Map *, const geometry::Vector<int> &);
+	TransitionState(MapState *, Map *, const math::Vector<int> &);
 	virtual ~TransitionState() { }
 
 public:
-	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 OnResize(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:
-	app::Application *ctrl;
+	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:
 	MapState *ms;
 	Map *map;
-	const geometry::Vector<int> &coordinates;
+	const math::Vector<int> &coordinates;
 
 };
 
 }
 
-#endif /* MAP_TRANSITIONSTATE_H_ */
+#endif