BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WIP] Collisions and sun stuff

Browse Source
This commit is contained in:
Tobias Dahl
2014-03-13 23:02:08 +01:00
parent fe1605a158
commit 28b83905e9
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/PlayerSystem.cpp
+10 -7
View File
@@ -27,15 +27,18 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
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(collision != nullptr)
{
for(auto ent : collision->CollidingEntities)
{
if(m_World->GetProperty<std::string>(ent, "Name") == "Obstacle")
{
m_World->RemoveEntity(entity);
}
}
}
if (name == "Camera") {