X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.h;fp=src%2Fworld%2FWorld.h;h=66d0d18c7b88fafe93e31346acfa30bdeb54eed8;hb=aa28d59d492c490194e8e8f7af086fcb531d170a;hp=6369757743d66c4d9d61a2ad04d1912e861995b0;hpb=7fccdf2cd07afb3afdc0b854e9a03130ef202eec;p=orbi.git

diff --git a/src/world/World.h b/src/world/World.h
index 6369757..66d0d18 100644
--- a/src/world/World.h
+++ b/src/world/World.h
@@ -1,8 +1,6 @@
 #ifndef ORBI_WORLD_H_
 #define ORBI_WORLD_H_
 
-#include "AABB.h"
-#include "Entity.h"
 #include "Tile.h"
 #include "../graphics/Vector.h"
 
@@ -12,6 +10,8 @@
 
 namespace orbi {
 
+class Entity;
+
 class World {
 
 public:
@@ -32,8 +32,8 @@ public:
 	const Tile &TileAt(Vector<int> pos) const { return tiles[Index(pos)]; }
 	void SetTile(Vector<int> pos, const Tile &t) { tiles[Index(pos)] = t; }
 
-	const std::list<Entity> &Entities() const { return entities; }
-	Entity &AddEntity(const Entity &);
+	const std::list<Entity *> &Entities() const { return entities; }
+	void AddEntity(Entity &e) { entities.push_back(&e); }
 
 private:
 	void BoundsCollision(Entity &, float dt);
@@ -50,9 +50,7 @@ private:
 
 	std::vector<Tile> tiles;
 
-	std::list<Entity> entities;
-
-	mutable AABB tileShape;
+	std::list<Entity *> entities;
 
 };