X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.h;h=6369757743d66c4d9d61a2ad04d1912e861995b0;hb=7fccdf2cd07afb3afdc0b854e9a03130ef202eec;hp=038f9dcce39db83362bea625a72f13384f041ef8;hpb=a8523bee4fc349a800f5f6d67b470c3a801beaa9;p=orbi.git

diff --git a/src/world/World.h b/src/world/World.h
index 038f9dc..6369757 100644
--- a/src/world/World.h
+++ b/src/world/World.h
@@ -19,6 +19,7 @@ public:
 
 public:
 	Vector<int> Size() const { return size; }
+	Vector<int> TileSize() const { return Vector<int>(1, 1); }
 
 public:
 	void Update(float dt);
@@ -30,7 +31,6 @@ public:
 	Tile &TileAt(Vector<int> pos) { return tiles[Index(pos)]; }
 	const Tile &TileAt(Vector<int> pos) const { return tiles[Index(pos)]; }
 	void SetTile(Vector<int> pos, const Tile &t) { tiles[Index(pos)] = t; }
-	const AABB &TileShapeAt(Vector<int> pos) const;
 
 	const std::list<Entity> &Entities() const { return entities; }
 	Entity &AddEntity(const Entity &);
@@ -38,6 +38,7 @@ public:
 private:
 	void BoundsCollision(Entity &, float dt);
 	void TileCollision(Entity &, float dt);
+	void EntityCollision();
 
 private:
 	Vector<int> size;