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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 96a5c22..243325c 100644
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -8,11 +8,14 @@
 #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
@@ -33,10 +36,27 @@ 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; }
+
+private:
+	static bool ZCompare(const Entity *lhs, const Entity *rhs);
+	void OnGridLock();
+	void OnMove();
+
 private:
 	const Map *map;
-	geometry::Vector<int> tempTarget;
+	Entity *controlled;
+	geometry::Vector<float> tempTarget;
+	geometry::Vector<int> lastLock;
 	graphics::Camera camera;
+	std::vector<Entity *> entities;
+	float walkingSpeed;
+	int nextDirection;
+	bool afterLock;
 
 };