X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=0ca5a847a5805ef37881ac2c519cc717720d6449;hb=978ccdf2644bc445c864dbe581ead365b238cff8;hp=b753ccfd61201aa1e2decb13f586c6bda05ef64d;hpb=a1c89e41e38eca790e168b8acd3beee974685fcd;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index b753ccf..0ca5a84 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -11,6 +11,7 @@
 #include "Entity.h"
 #include "fwd.h"
 #include "../app/State.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Camera.h"
 
@@ -22,7 +23,7 @@ class MapState
 : public app::State {
 
 public:
-	explicit MapState(Map *);
+	explicit MapState(common::GameConfig *, Map *);
 	virtual ~MapState() { }
 
 public:
@@ -42,23 +43,44 @@ 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 OnGridLock();
-	void OnMove();
 
-	void UpdateFollower(Entity *);
+	void UnloadMap();
+	void LoadMap(Map *);
+
+	bool CheckBlocking();
+	bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
+
+	void OnTileLock();
+	bool OnGridLock();
+	void OnMove(bool);
+
+	void UpdateFollower(Entity &);
+	void StopFollowers(Entity &);
+
+	void LockEntities();
+	bool CheckMonster();
+	bool CheckTrigger();
 
 private:
+	common::GameConfig *game;
+	app::Application *ctrl;
 	Map *map;
 	Entity *controlled;
-	geometry::Vector<float> tempTarget;
+	Entity *pushed;
+	app::Timer<float> moveTimer;
 	geometry::Vector<int> lastLock;
 	graphics::Camera camera;
 	std::vector<Entity *> entities;
 	float walkingSpeed;
 	int nextDirection;
 	bool afterLock;
+	bool skipLock;
+	bool pushing;
+	bool debug;
 
 };