X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=5bbd6f856648c25bf062e2e015cf50fe2db71aeb;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=0e49100e3b305b6e458123af8060986fd4b76958;hpb=7fb774ec1df3d550cd8a6805bdc69c11ad36e498;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 0e49100..5bbd6f8 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -1,37 +1,29 @@
-/*
- * MapState.h
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #ifndef MAP_MAPSTATE_H_
 #define MAP_MAPSTATE_H_
 
 #include "Entity.h"
 #include "fwd.h"
 #include "../app/State.h"
-#include "../geometry/Vector.h"
+#include "../common/fwd.h"
+#include "../common/ScriptHost.h"
+#include "../common/ScriptRunner.h"
+#include "../math/Vector.h"
 #include "../graphics/Camera.h"
 
 #include <vector>
 
 namespace map {
 
+/// Shows a map and its entities an optionally control a single entity.
 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,7 +34,17 @@ public:
 
 	void SetWalkingSpeed(float s) { walkingSpeed = s; }
 
-	void Transition(Map *, const geometry::Vector<int> &coordinates);
+	void Transition(Map *, const math::Vector<int> &coordinates);
+
+	virtual void HandleSyscall(common::ScriptRunner &);
+
+private:
+	virtual void OnEnterState(SDL_Surface *screen);
+	virtual void OnExitState(SDL_Surface *screen);
+	virtual void OnResumeState(SDL_Surface *screen);
+	virtual void OnPauseState(SDL_Surface *screen);
+
+	virtual void OnResize(int width, int height);
 
 private:
 	static bool ZCompare(const Entity *lhs, const Entity *rhs);
@@ -50,31 +52,43 @@ private:
 	void UnloadMap();
 	void LoadMap(Map *);
 
-	bool CheckBlocking() const;
+	bool CheckBlocking();
+	bool CheckBlocking(const math::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;
+	math::Vector<int> lastLock;
 	graphics::Camera camera;
 	std::vector<Entity *> entities;
 	float walkingSpeed;
 	int nextDirection;
 	bool afterLock;
 	bool skipLock;
+	bool pushing;
 	bool debug;
 
 };