Browse Source

registry: make ::release use ::bump return value

Michele Caini 3 years ago
parent
commit
d288ecd70d
1 changed files with 2 additions and 6 deletions
  1. 2 6
      src/entt/entity/registry.hpp

+ 2 - 6
src/entt/entity/registry.hpp

@@ -673,13 +673,9 @@ public:
      */
      */
     version_type release(const entity_type entt, const version_type version) {
     version_type release(const entity_type entt, const version_type version) {
         ENTT_ASSERT(orphan(entt), "Non-orphan entity");
         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->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);
     }
     }
 
 
     /**
     /**