X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=b243c3b07258cf9529d0bfe6e6309e56826569cf;hb=abfa371d1d2c14052d4cbfc885b8383c6da7d499;hp=35c6d6494ef6008a2638d67a27fe3f032c8de85d;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 35c6d64..b243c3b 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -1,26 +1,28 @@
-/*
- * 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 "../app/Timer.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 +32,35 @@ 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 ControlEntity(Entity *e) { controlled = e; TrackControlled(); }
+	void Track(math::Vector<math::Fixed<8> > *t) { camera.SetTarget(t); }
+	void TrackControlled() { if (controlled) Track(&controlled->Position()); }
 
-	void SetWalkingSpeed(float s) { walkingSpeed = s; }
+	math::Vector<math::Fixed<8> > TrackPoint() const { return *camera.GetTarget(); }
 
-	void Transition(Map *, const geometry::Vector<int> &coordinates);
+	void SetWalkingSpeed(math::Fixed<8> s) { walkingSpeed = s; }
+
+	void Transition(Map *, const math::Vector<int> &coordinates);
 
 	virtual void HandleSyscall(common::ScriptRunner &);
 
+	const graphics::Camera &GetCamera() const { return camera; }
+	Map *GetMap() { return map; }
+
+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 +68,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();
@@ -68,6 +79,7 @@ private:
 
 	void LockEntities();
 	bool CheckMonster();
+	void LoadBattle(Entity &hero, Entity &monster);
 
 	bool CheckLockTrigger();
 	bool CheckMoveTrigger();
@@ -80,16 +92,16 @@ 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;
+	app::Timer<Uint32> tileAnimation;
 	int nextDirection;
 	bool afterLock;
 	bool skipLock;
@@ -100,4 +112,4 @@ private:
 
 }
 
-#endif /* MAP_MAPSTATE_H_ */
+#endif