X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=dc352f69522636e5f2248076f6cddb59bea2a804;hb=389d2fcb1e9ca1023cda11da80f00272ab20903a;hp=243325c69e5fef58ed8eff91efd03ea9d5ee758a;hpb=9302f6869530e5492c73ef6f12f9cea348e8b2a6;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 243325c..dc352f6 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -22,7 +22,7 @@ class MapState
 : public app::State {
 
 public:
-	explicit MapState(const Map *);
+	explicit MapState(Map *);
 	virtual ~MapState() { }
 
 public:
@@ -42,14 +42,32 @@ public:
 
 	void SetWalkingSpeed(float s) { walkingSpeed = s; }
 
+	void Transition(Map *, const geometry::Vector<int> &coordinates);
+
 private:
 	static bool ZCompare(const Entity *lhs, const Entity *rhs);
+
+	void UnloadMap();
+	void LoadMap(Map *);
+
+	bool CheckBlocking() const;
+
+	void OnTileLock();
 	void OnGridLock();
-	void OnMove();
+	void OnMove(bool);
+
+	void UpdateFollower(Entity &);
+	void StopFollowers(Entity &);
+
+	void LockEntities();
+	void CheckMonster();
+	void CheckTrigger();
 
 private:
-	const Map *map;
+	app::Application *ctrl;
+	Map *map;
 	Entity *controlled;
+	app::Timer<float> moveTimer;
 	geometry::Vector<float> tempTarget;
 	geometry::Vector<int> lastLock;
 	graphics::Camera camera;
@@ -57,6 +75,8 @@ private:
 	float walkingSpeed;
 	int nextDirection;
 	bool afterLock;
+	bool skipLock;
+	bool debug;
 
 };