X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworld%2FWorld.cpp;h=e8b665c992366ca2b5f2ecc0efd63447a2f8d73d;hb=549646ac3e5bede5e77031f773649edf8de83608;hp=97dcc0848a40a7936179ee7e4171aac8c29f1fd1;hpb=5d2da8a07411ad6417d6ed8d1be997189cf5ce89;p=blank.git

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 97dcc08..e8b665c 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -234,7 +234,7 @@ Chunk &World::PlayerChunk() {
 	return chunks.ForceLoad(player->ChunkCoords());
 }
 
-Chunk &World::Next(const Chunk &to, const glm::tvec3<int> &dir) {
+Chunk &World::Next(const Chunk &to, const glm::ivec3 &dir) {
 	const Chunk::Pos tgt_pos = to.Position() + dir;
 	return chunks.ForceLoad(tgt_pos);
 }
@@ -257,6 +257,13 @@ void World::Update(int dt) {
 			Resolve(entity, col);
 		}
 	}
+	for (auto iter = entities.begin(), end = entities.end(); iter != end;) {
+		if (iter->CanRemove()) {
+			iter = entities.erase(iter);
+		} else {
+			++iter;
+		}
+	}
 	chunks.Rebase(player->ChunkCoords());
 	chunks.Update(dt);
 }