X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=dc352f69522636e5f2248076f6cddb59bea2a804;hb=e02068d51f5e7f82d4d3195e9a9ce5c9d76f727d;hp=4ba149db1d96c3e05749c4a5b32f411b5938dfc5;hpb=07cdc452aeaad73ca9f8f9a3cf9868d2b6c9d5b3;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 4ba149d..dc352f6 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -42,9 +42,14 @@ 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();
@@ -59,6 +64,7 @@ private:
 	void CheckTrigger();
 
 private:
+	app::Application *ctrl;
 	Map *map;
 	Entity *controlled;
 	app::Timer<float> moveTimer;
@@ -69,6 +75,7 @@ private:
 	float walkingSpeed;
 	int nextDirection;
 	bool afterLock;
+	bool skipLock;
 	bool debug;
 
 };