From d288ecd70dea3bfe35e8e0f0ab347e2361edae4b Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Thu, 16 Feb 2023 09:59:42 +0100 Subject: [PATCH] registry: make ::release use ::bump return value --- src/entt/entity/registry.hpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp index 6a8b70451..88ef2bb12 100644 --- a/src/entt/entity/registry.hpp +++ b/src/entt/entity/registry.hpp @@ -673,13 +673,9 @@ public: */ version_type release(const entity_type entt, const version_type version) { ENTT_ASSERT(orphan(entt), "Non-orphan entity"); - auto elem = traits_type::construct(traits_type::to_entity(entt), version); - elem = (elem == tombstone) ? traits_type::next(elem) : elem; - shortcut->erase(entt); - shortcut->bump(elem); - - return traits_type::to_version(elem); + const auto elem = traits_type::construct(traits_type::to_entity(entt), version); + return shortcut->bump((elem == tombstone) ? traits_type::next(elem) : elem); } /**