Merge pull request miguelmartin75#80 from spitofland/master

Make isValid more useful/user-friendly
ninnghazad · Dec 17, 2016 · fa01241 · fa01241
2 parents 448e6c3 + 9a080e4
commit fa01241
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/anax/World.cpp b/src/anax/World.cpp
@@ -114,9 +114,10 @@ namespace anax
 
     bool World::isActivated(const Entity& entity) const
     {
-        ANAX_ASSERT(isValid(entity), "invalid entity passed to isActivated");
-
-        return m_entityAttributes.attributes[entity.getId().index].activated;
+        if(isValid(entity))
+            return m_entityAttributes.attributes[entity.getId().index].activated;
+        else
+            return false;
     }
 
     bool World::isValid(const anax::Entity &entity) const

diff --git a/src/anax/detail/EntityIdPool.cpp b/src/anax/detail/EntityIdPool.cpp
@@ -69,14 +69,18 @@ namespace anax
 
         Entity::Id EntityIdPool::get(std::size_t index) const
         {
-            ANAX_ASSERT(index < m_counts.size(), "Entity index is out of range");
-            ANAX_ASSERT(!(m_counts[index] == 0), "Entity ID does not exist");
-            return Entity::Id{index, m_counts[index]};
+            if(index < m_counts.size())
+                return Entity::Id{index, m_counts[index]};
+            else
+                return Entity::Id{index, 0};
         }
 
         bool EntityIdPool::isValid(Entity::Id id) const
         {
-            return id.counter == m_counts[id.index];
+            if(id.index >= m_counts.size())
+                return false;
+            else
+                return (id.counter == m_counts[id.index]) && (id.counter > 0);
         }
 
         std::size_t EntityIdPool::getSize() const
@@ -94,8 +98,6 @@ namespace anax
             m_counts.clear();
             m_freeList.clear();
             m_nextId = 0;
-
-            m_counts.resize(m_defaultPoolSize);
         }
     }
 }
diff --git a/tests/Test_Entities.cpp b/tests/Test_Entities.cpp
@@ -67,7 +67,7 @@ using namespace anax;
 //      ✓ Removing a component => does hasComponent return false?
 //      ✓ Removing all components => does hasComponent return false?
 // 6. Retrieving an entity via index
-//      ✓ Invalid index => assertion occurs?
+//      ✓ Invalid index => invalid entity returned?
 //      ✓  Valid index => appropriate entity returned?
 //      ✓ Multiple entities added/removed => appropriate entity returned?
 
@@ -414,7 +414,7 @@ const lest::test specification[] =
         anax::World world;
 
         auto e = world.createEntity();
-        EXPECT_THROWS_AS(world.getEntity(-1), anax::TestException);
+        EXPECT(!(world.getEntity(-1).isValid()));
     }
 };