X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=bf19f4d5d315b0e8750d0e544588a336083f59cd;hb=6e88a625710c7936f87b38ecf6094472f3a49f4f;hp=a6d292b78d757b4b694e587ca29716f2e79333fd;hpb=0ad5ca97b5df217329bc319d62564a9f46ba11d7;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index a6d292b..bf19f4d 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -51,7 +51,8 @@ private:
 	void UnloadMap();
 	void LoadMap(Map *);
 
-	bool CheckBlocking() const;
+	bool CheckBlocking();
+	bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
 
 	void OnTileLock();
 	bool OnGridLock();
@@ -62,15 +63,18 @@ private:
 
 	void LockEntities();
 	bool CheckMonster();
-	bool CheckTrigger();
+
+	bool CheckLockTrigger();
+	bool CheckMoveTrigger();
+	void RunTrigger(Trigger &);
 
 private:
 	common::GameConfig *game;
 	app::Application *ctrl;
 	Map *map;
 	Entity *controlled;
+	Entity *pushed;
 	app::Timer<float> moveTimer;
-	geometry::Vector<float> tempTarget;
 	geometry::Vector<int> lastLock;
 	graphics::Camera camera;
 	std::vector<Entity *> entities;
@@ -78,6 +82,7 @@ private:
 	int nextDirection;
 	bool afterLock;
 	bool skipLock;
+	bool pushing;
 	bool debug;
 
 };