From: Zack Mulgrew Date: Fri, 26 Feb 2016 14:25:53 +0000 (-0800) Subject: Revert "Fix method name to be consistent with others" X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=273fc4450bae5c0d39107183b79ca0aced3ff205;p=clyne%2Fentityx.git Revert "Fix method name to be consistent with others" This reverts commit f176609c242afd53f6083b3e115227ace10e2eb2. --- diff --git a/entityx/Entity.h b/entityx/Entity.h index 5e9b17d..2ef01f7 100644 --- a/entityx/Entity.h +++ b/entityx/Entity.h @@ -384,7 +384,7 @@ class EntityManager : entityx::help::NonCopyable { for (size_t i = 0; i < component_pools_.size(); i++) { BasePool *pool = component_pools_[i]; if (pool && mask.test(i)) { - pool->remove_component(Entity(this, entity)); + pool->removeComponent(Entity(this, entity)); pool->destroy(index); } } diff --git a/entityx/help/Pool.h b/entityx/help/Pool.h index b28e4e7..c4b7d83 100644 --- a/entityx/help/Pool.h +++ b/entityx/help/Pool.h @@ -65,7 +65,7 @@ class BasePool { } virtual void destroy(std::size_t n) = 0; - virtual void remove_component(Entity entity) = 0; + virtual void removeComponent(Entity entity) = 0; protected: std::vector blocks_; @@ -94,7 +94,7 @@ class Pool : public BasePool { ptr->~T(); } - virtual void remove_component(Entity entity) override { + virtual void removeComponent(Entity entity) override { entity.remove(); } };