X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=9cff10cbfa5cbd248b7188d7bd3bfb762342ae92;hb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;hp=c565632569a766552ee4c693d6b8f963eea23f15;hpb=85d247c6e6b1bb2a6e0b177ef71a4541e69380d1;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index c565632..9cff10c 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,19 +22,14 @@
 namespace map {
 
 class MapState
-: public app::State {
+: public app::State
+, public common::ScriptHost {
 
 public:
 	explicit MapState(common::GameConfig *, Map *);
 	virtual ~MapState() { }
 
 public:
-	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void Resize(int width, int height);
-
 	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
@@ -45,6 +42,16 @@ public:
 
 	void Transition(Map *, const geometry::Vector<int> &coordinates);
 
+	virtual void HandleSyscall(common::ScriptRunner &);
+
+private:
+	virtual void OnEnterState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
+
+	virtual void OnResize(int width, int height);
+
 private:
 	static bool ZCompare(const Entity *lhs, const Entity *rhs);
 
@@ -63,16 +70,23 @@ 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;