X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmap%2FMapState.h;h=ccdb51e7fef0c07477640387a4e828f7dcf182ee;hb=d8d0982340fc10e5161251a4b50223fabc7b4431;hp=b753ccfd61201aa1e2decb13f586c6bda05ef64d;hpb=a1c89e41e38eca790e168b8acd3beee974685fcd;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index b753ccf..ccdb51e 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -42,16 +42,28 @@ 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);
+
+	bool CheckBlocking() const;
+
+	void OnTileLock();
 	void OnGridLock();
-	void OnMove();
+	void OnMove(bool);
+
+	void UpdateFollower(Entity &);
+	void StopFollowers(Entity &);
 
-	void UpdateFollower(Entity *);
+	void LockEntities();
+	void CheckMonster();
+	void CheckTrigger();
 
 private:
 	Map *map;
 	Entity *controlled;
+	app::Timer<float> moveTimer;
 	geometry::Vector<float> tempTarget;
 	geometry::Vector<int> lastLock;
 	graphics::Camera camera;
@@ -59,6 +71,8 @@ private:
 	float walkingSpeed;
 	int nextDirection;
 	bool afterLock;
+	bool skipLock;
+	bool debug;
 
 };