removed useless comments

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 35c6d6494ef6008a2638d67a27fe3f032c8de85d..09ba35780b74f8dbb70ea52afb00c757bbd82b12 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -1,26 +1,27 @@
-/*
- * MapState.h
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #ifndef MAP_MAPSTATE_H_
 #define MAP_MAPSTATE_H_
 
+namespace common {
+       struct GameConfig;
+}
+namespace map {
+       class Map;
+       class Trigger;
+}
+
 #include "Entity.h"
-#include "fwd.h"
 #include "../app/State.h"
-#include "../common/fwd.h"
 #include "../common/ScriptHost.h"
 #include "../common/ScriptRunner.h"
-#include "../geometry/Vector.h"
+#include "../math/Fixed.h"
+#include "../math/Vector.h"
 #include "../graphics/Camera.h"
 
 #include <vector>
 
 namespace map {
 
+/// Shows a map and its entities an optionally control a single entity.
 class MapState
 : public app::State
 , public common::ScriptHost {
@@ -30,26 +31,28 @@ public:
        virtual ~MapState() { }
 
 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 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 *);
 
 public:
        void AddEntity(Entity *e) { entities.push_back(e); }
        void ControlEntity(Entity *e) { controlled = e; camera.SetTarget(&e->Position()); }
 
-       void SetWalkingSpeed(float s) { walkingSpeed = s; }
+       void SetWalkingSpeed(math::Fixed<8> s) { walkingSpeed = s; }
 
-       void Transition(Map *, const geometry::Vector<int> &coordinates);
+       void Transition(Map *, const math::Vector<int> &coordinates);
 
        virtual void HandleSyscall(common::ScriptRunner &);
 
+private:
+       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:
        static bool ZCompare(const Entity *lhs, const Entity *rhs);
 
@@ -57,7 +60,7 @@ private:
        void LoadMap(Map *);
 
        bool CheckBlocking();
-       bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
+       bool CheckBlocking(const math::Vector<int> &position, Entity::Orientation direction) const;
 
        void OnTileLock();
        bool OnGridLock();
@@ -80,16 +83,15 @@ private:
 
 private:
        common::GameConfig *game;
-       app::Application *ctrl;
        Map *map;
        Entity *controlled;
        Entity *pushed;
        common::ScriptRunner runner;
-       app::Timer<float> moveTimer;
-       geometry::Vector<int> lastLock;
+       app::Timer<Uint32> moveTimer;
+       math::Vector<int> lastLock;
        graphics::Camera camera;
        std::vector<Entity *> entities;
-       float walkingSpeed;
+       math::Fixed<8> walkingSpeed;
        int nextDirection;
        bool afterLock;
        bool skipLock;
@@ -100,4 +102,4 @@ private:
 
 }
 
-#endif /* MAP_MAPSTATE_H_ */
+#endif