Check if entity exists before adding / removing component.

NatWeiss · May 24, 2015 · 8ee880c · 8ee880c
1 parent 69edca4
commit 8ee880c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/EntityFu.cpp b/EntityFu.cpp
@@ -124,7 +124,7 @@ void Entity::addComponent(Cid cid, Eid eid, Component* c)
 {
 	if (c == nullptr)
 		return;
-	if (eid >= kMaxEntities || cid >= Component::numCids)
+	if (eid >= kMaxEntities || !entities[eid] || cid >= Component::numCids)
 	{
 		Assert2(false, "Invalid eid %u or cid %u", eid, cid);
 		return;
@@ -153,7 +153,7 @@ void Entity::addComponent(Cid cid, Eid eid, Component* c)
 
 void Entity::removeComponent(Cid cid, Eid eid)
 {
-	if (eid >= kMaxEntities || cid >= Component::numCids)
+	if (eid >= kMaxEntities || !entities[eid] || cid >= Component::numCids)
 	{
 		Assert2(false, "Invalid eid %u or cid %u", eid, cid);
 		return;