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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index e7a75b6..9cff10c 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -11,6 +11,9 @@
 #include "Entity.h"
 #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"
 
@@ -19,19 +22,14 @@
 namespace map {
 
 class MapState
-: public app::State {
+: public app::State
+, public common::ScriptHost {
 
 public:
-	explicit MapState(Map *);
+	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 *);
@@ -42,33 +40,62 @@ public:
 
 	void SetWalkingSpeed(float s) { walkingSpeed = s; }
 
+	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);
 
-	bool CheckBlocking() const;
+	void UnloadMap();
+	void LoadMap(Map *);
+
+	bool CheckBlocking();
+	bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
 
 	void OnTileLock();
-	void OnGridLock();
+	bool OnGridLock();
 	void OnMove(bool);
 
 	void UpdateFollower(Entity &);
 	void StopFollowers(Entity &);
 
 	void LockEntities();
-	void CheckMonster();
-	void CheckTrigger();
+	bool CheckMonster();
+
+	bool CheckLockTrigger();
+	bool CheckMoveTrigger();
+	void RunTrigger(Trigger &);
+
+	enum Syscalls {
+		TRANSITION = 1,
+		WARP = 2,
+	};
 
 private:
+	common::GameConfig *game;
 	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;
 	float walkingSpeed;
 	int nextDirection;
 	bool afterLock;
+	bool skipLock;
+	bool pushing;
+	bool debug;
 
 };