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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index a6d292b..952bcee 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -12,6 +12,8 @@
 #include "fwd.h"
 #include "../app/State.h"
 #include "../common/fwd.h"
+#include "../common/ScriptHost.h"
+#include "../common/ScriptRunner.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Camera.h"
 
@@ -20,7 +22,8 @@
 namespace map {
 
 class MapState
-: public app::State {
+: public app::State
+, public common::ScriptHost {
 
 public:
 	explicit MapState(common::GameConfig *, Map *);
@@ -45,13 +48,16 @@ public:
 
 	void Transition(Map *, const geometry::Vector<int> &coordinates);
 
+	virtual void HandleSyscall(common::ScriptRunner &);
+
 private:
 	static bool ZCompare(const Entity *lhs, const Entity *rhs);
 
 	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 +68,24 @@ private:
 
 	void LockEntities();
 	bool CheckMonster();
-	bool CheckTrigger();
+
+	bool CheckLockTrigger();
+	bool CheckMoveTrigger();
+	void RunTrigger(Trigger &);
+
+	enum Syscalls {
+		TRANSITION = 1,
+		WARP = 2,
+	};
 
 private:
 	common::GameConfig *game;
 	app::Application *ctrl;
 	Map *map;
 	Entity *controlled;
+	Entity *pushed;
+	common::ScriptRunner runner;
 	app::Timer<float> moveTimer;
-	geometry::Vector<float> tempTarget;
 	geometry::Vector<int> lastLock;
 	graphics::Camera camera;
 	std::vector<Entity *> entities;
@@ -78,6 +93,7 @@ private:
 	int nextDirection;
 	bool afterLock;
 	bool skipLock;
+	bool pushing;
 	bool debug;
 
 };