switched geometric scalars from floating to fixed

[l2e.git] / src / map / TransitionState.h

diff --git a/src/map/TransitionState.h b/src/map/TransitionState.h
index ee832a81a482391a1fffb3c693bb0a17c17adc2c..293cdb2cf906bdd57f5e368253113d68bdf74057 100644 (file)
--- a/src/map/TransitionState.h
+++ b/src/map/TransitionState.h
@@ -1,16 +1,9 @@
-/*
- * TransitionState.h
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #ifndef MAP_TRANSITIONSTATE_H_
 #define MAP_TRANSITIONSTATE_H_
 
 #include "fwd.h"
 #include "../app/State.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 namespace map {
 
@@ -18,26 +11,26 @@ 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 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:
-       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;
 
 };