From ed87d759e06321f9ea5a39ad99dee3cfce3269a1 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 10 Mar 2025 17:28:09 +0100 Subject: [PATCH] a --- src/p_tick.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/p_tick.c b/src/p_tick.c index 6ddfcd99a..e7f287fc4 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -248,28 +248,20 @@ void P_RemoveThinkerDelayed(thinker_t *thinker) else if (thinker->references) // Usually gets cleared up in one frame; what's going on here, then? CONS_Printf("Number of potentially faulty references: %d\n", thinker->references); #endif - if (thinker->references) + + if (thinker->references != 0) return; - /* Remove from main thinker list */ - thinker_t *next = thinker->next; - /* Note that currentthinker is guaranteed to point to us, - * and since we're freeing our memory, we had better change that. So - * point it to thinker->prev, so the iterator will correctly move on to - * thinker->prev->next = thinker->next */ - (next->prev = currentthinker = thinker->prev)->next = next; R_DestroyLevelInterpolators(thinker); - if (thinker->cachable == true) - { - // put cachable thinkers in the mobj cache, so we can avoid allocations - ((mobj_t *)thinker)->hnext = mobjcache; - mobjcache = (mobj_t *)thinker; - } - else - { - Z_Free(thinker); - } + /* Note that currentthinker is guaranteed to point to us, + * and since we're freeing our memory, we had better change that. So + * point it to thinker->prev, so the iterator will correctly move on to + * thinker->prev->next = thinker->next */ + currentthinker = thinker->prev; + + /* Remove from main thinker list */ + P_UnlinkThinker(thinker); } // @@ -285,9 +277,6 @@ void P_UnlinkThinker(thinker_t *thinker) (next->prev = thinker->prev)->next = next; - //if (thinker->cachable != true && thinker->cachable != false) - //CONS_Alert(CONS_ERROR, "P_UnlinkThinker: weird value for cachable = %d\n", thinker->cachable); - if (thinker->cachable == true) { // put cachable thinkers in the mobj cache, so we can avoid allocations