From 416f96590d7e09433549fb4cc35c21b1b437ac4c Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sat, 5 Sep 2015 14:56:49 +0200
Subject: [PATCH] adjust player index if entity is removed

---
 src/world/World.cpp | 11 ++++++++++-
 src/world/World.hpp |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 6ad30ff..7b90954 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -227,7 +227,7 @@ void World::Update(int dt) {
 	}
 	for (auto iter = entities.begin(), end = entities.end(); iter != end;) {
 		if (iter->CanRemove()) {
-			iter = entities.erase(iter);
+			iter = RemoveEntity(iter);
 		} else {
 			++iter;
 		}
@@ -269,6 +269,15 @@ void World::Resolve(Entity &e, std::vector<WorldCollision> &col) {
 	e.Move(final_disp);
 }
 
+World::EntityHandle World::RemoveEntity(EntityHandle &eh) {
+	// check for player
+	auto player = std::find(players.begin(), players.end(), &*eh);
+	if (player != players.end()) {
+		players.erase(player);
+	}
+	return entities.erase(eh);
+}
+
 
 void World::Render(Viewport &viewport) {
 	DirectionalLighting &entity_prog = viewport.EntityProgram();
diff --git a/src/world/World.hpp b/src/world/World.hpp
index 9ae0faa..9739e21 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -87,6 +87,10 @@ public:
 
 	void Render(Viewport &);
 
+private:
+	using EntityHandle = std::list<Entity>::iterator;
+	EntityHandle RemoveEntity(EntityHandle &);
+
 private:
 	Config config;
 
-- 
2.39.2