diff options
Diffstat (limited to 'entityx/Entity.h')
| -rw-r--r-- | entityx/Entity.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/entityx/Entity.h b/entityx/Entity.h index a423f8f..e7d2e8d 100644 --- a/entityx/Entity.h +++ b/entityx/Entity.h @@ -46,7 +46,7 @@ class EntityManager; template <typename C, typename EM = EntityManager> class ComponentHandle; - +struct Killed {}; /** A convenience handle around an Entity::Id. * @@ -166,6 +166,8 @@ public: std::bitset<entityx::MAX_COMPONENTS> component_mask() const; + void kill(); + private: EntityManager *manager_ = nullptr; Entity::Id id_ = INVALID; @@ -462,11 +464,13 @@ class EntityManager : entityx::help::NonCopyable { public: template <typename T> struct identity { typedef T type; }; - void each(typename identity<std::function<void(Entity entity, Components&...)>>::type f) { + void each(typename identity<std::function<void(Entity entity, Components&...)>>::type f, bool dead = false) { static std::mutex locked; locked.lock(); - for (auto it : *this) - f(it, *(it.template component<Components>().get())...); + for (auto it : *this) { + if (dead || !it.has_component<Killed>()) + f(it, *(it.template component<Components>().get())...); + } locked.unlock(); } @@ -766,8 +770,8 @@ class EntityManager : entityx::help::NonCopyable { template <typename T> struct identity { typedef T type; }; template <typename ... Components> - void each(typename identity<std::function<void(Entity entity, Components&...)>>::type f) { - return entities_with_components<Components...>().each(f); + void each(typename identity<std::function<void(Entity entity, Components&...)>>::type f, bool dead = false) { + return entities_with_components<Components...>().each(f, dead); } /** |