From 292e4ca132ce6f65b74c38840ba701ae1994aced Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 2 Jan 2024 16:48:22 +0900 Subject: [PATCH] [ecs] Pass the registry in to the component destroy function This makes it possible for hierarchies to clean themselves up (by deleting their entities (though that will cause other problems later when the hierarchy doesn't own the entities)), thus plugging a memory leak when parsing passage text. --- libs/ecs/hierarchy.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/ecs/hierarchy.c b/libs/ecs/hierarchy.c index 41cd2690d..3eccf41c6 100644 --- a/libs/ecs/hierarchy.c +++ b/libs/ecs/hierarchy.c @@ -477,6 +477,10 @@ Hierarchy_Create (hierarchy_t *hierarchy) static void hierarchy_destroy (hierarchy_t *hierarchy) { + hierarchy_InvalidateReferences (hierarchy, 0, hierarchy->num_objects); + for (uint32_t i = 0; i < hierarchy->num_objects; i++) { + ECS_DelEntity (hierarchy->reg, hierarchy->ent[i]); + } free (hierarchy->ent); free (hierarchy->childCount); free (hierarchy->childIndex);