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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index e180d48..952bcee 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,10 +22,11 @@
 namespace map {
 
 class MapState
-: public app::State {
+: public app::State
+, public common::ScriptHost {
 
 public:
-	explicit MapState(const Map *);
+	explicit MapState(common::GameConfig *, Map *);
 	virtual ~MapState() { }
 
 public:
@@ -40,15 +44,57 @@ public:
 	void AddEntity(Entity *e) { entities.push_back(e); }
 	void ControlEntity(Entity *e) { controlled = e; camera.SetTarget(&e->Position()); }
 
+	void SetWalkingSpeed(float s) { walkingSpeed = s; }
+
+	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();
+	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 CheckLockTrigger();
+	bool CheckMoveTrigger();
+	void RunTrigger(Trigger &);
+
+	enum Syscalls {
+		TRANSITION = 1,
+		WARP = 2,
+	};
+
 private:
-	const Map *map;
+	common::GameConfig *game;
+	app::Application *ctrl;
+	Map *map;
 	Entity *controlled;
-	geometry::Vector<float> tempTarget;
+	Entity *pushed;
+	common::ScriptRunner runner;
+	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;
 
 };