From 329262fe5a3d30331bd66eeecb2acbf56a8d3072 Mon Sep 17 00:00:00 2001
From: Tobias Dahl <dahltobbe@hotmail.com>
Date: Thu, 13 Mar 2014 21:38:29 +0100
Subject: [PATCH] [WIP] Colliderar saker

---
 Escape-the-Dawn/Systems/PlayerSystem.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Escape-the-Dawn/Systems/PlayerSystem.cpp b/Escape-the-Dawn/Systems/PlayerSystem.cpp
index a55bdf3..1327bce 100644
--- a/Escape-the-Dawn/Systems/PlayerSystem.cpp
+++ b/Escape-the-Dawn/Systems/PlayerSystem.cpp
@@ -26,6 +26,15 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 	if (input == nullptr)
 		return;
 
+	auto collision = m_World->GetComponent<Components::Collision>(entity, "Collision");
+	if(collision == nullptr)
+		return;
+
+	if(collision->CollidingEntities.size() > 0)
+	{
+		m_World->RemoveEntity(entity);
+	}
+
 	auto name = m_World->GetProperty<std::string>(entity, "Name");
 	if (name == "Camera" && freecamEnabled) {
 		glm::vec3 Camera_Right = glm::vec3(glm::vec4(1, 0, 0, 0) * transform->Orientation);