X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=dc352f69522636e5f2248076f6cddb59bea2a804;hb=d2d8ff1fd5f55e8b43d48ae5e75c216492e2f032;hp=96a5c22bec22a7cf9a9198ea215568193e74066a;hpb=dc7b19b8d0be4aff410f9c4514c742fe28b25ff4;p=l2e.git

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 96a5c22..dc352f6 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -8,18 +8,21 @@
 #ifndef MAP_MAPSTATE_H_
 #define MAP_MAPSTATE_H_
 
+#include "Entity.h"
 #include "fwd.h"
 #include "../app/State.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Camera.h"
 
+#include <vector>
+
 namespace map {
 
 class MapState
 : public app::State {
 
 public:
-	explicit MapState(const Map *);
+	explicit MapState(Map *);
 	virtual ~MapState() { }
 
 public:
@@ -33,10 +36,47 @@ public:
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
+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);
+
+private:
+	static bool ZCompare(const Entity *lhs, const Entity *rhs);
+
+	void UnloadMap();
+	void LoadMap(Map *);
+
+	bool CheckBlocking() const;
+
+	void OnTileLock();
+	void OnGridLock();
+	void OnMove(bool);
+
+	void UpdateFollower(Entity &);
+	void StopFollowers(Entity &);
+
+	void LockEntities();
+	void CheckMonster();
+	void CheckTrigger();
+
 private:
-	const Map *map;
-	geometry::Vector<int> tempTarget;
+	app::Application *ctrl;
+	Map *map;
+	Entity *controlled;
+	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 debug;
 
 };