From 6cffe744e6e76acb1ea345cc5e1ae627138bae22 Mon Sep 17 00:00:00 2001 From: Eidolon Date: Sun, 10 Nov 2024 10:56:16 -0600 Subject: [PATCH] Revert "Put taglists in LevelPool memory" This reverts commit aab0465fab64090b4039b5c5cc0417bae64cafdf. --- src/taglist.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/taglist.c b/src/taglist.c index acd2b6aa3..3421326a5 100644 --- a/src/taglist.c +++ b/src/taglist.c @@ -31,18 +31,9 @@ taggroup_t* tags_lines[MAXTAGS + 1]; /// \warning This does not rebuild the global taggroups, which are used for iteration. void Tag_Add (taglist_t* list, const mtag_t tag) { - mtag_t *oldlist; - mtag_t *newlist; if (Tag_Find(list, tag)) return; - oldlist = list->tags; - newlist = Z_LevelPoolMalloc((list->count + 1) * sizeof(mtag_t)); - if (oldlist) - { - memcpy(newlist, oldlist, list->count * sizeof(mtag_t)); - Z_LevelPoolFree(oldlist, list->count * sizeof(mtag_t)); - } - list->tags = newlist; + list->tags = Z_Realloc(list->tags, (list->count + 1) * sizeof(mtag_t), PU_LEVEL, NULL); list->tags[list->count++] = tag; } @@ -54,17 +45,13 @@ void Tag_Remove(taglist_t* list, const mtag_t tag) for (i = 0; i < list->count; i++) { - mtag_t *newlist; if (list->tags[i] != tag) continue; for (; i+1 < list->count; i++) list->tags[i] = list->tags[i+1]; - newlist = Z_LevelPoolMalloc((list->count - 1) * sizeof(mtag_t)); - memcpy(newlist, list->tags, (list->count) * sizeof(mtag_t)); - Z_LevelPoolFree(list->tags, (list->count) * sizeof(mtag_t)); - list->tags = newlist; + list->tags = Z_Realloc(list->tags, (list->count - 1) * sizeof(mtag_t), PU_LEVEL, NULL); return; } }