From dd2a227529f2e100b3199fda5c7a1aef42223fbb Mon Sep 17 00:00:00 2001 From: Alug Date: Fri, 25 Sep 2026 18:41:29 +0200 Subject: [PATCH] mobj hnext/hprev list fixes for phobos build too lazy to cherry pick so https://gitlab.com/kart-krew-dev/ring-racers/-/commit/a392996a5437742d5b7a91d0fce9da49c3a8bd76 and https://gitlab.com/kart-krew-dev/ring-racers/-/commit/8b5bd645ca5d8ef9269aa6ccf4375337bd0c1672 both of which might change behavior so phobos only --- src/k_kart.c | 23 +++++++++++++++++++++-- src/p_mobj.c | 16 ++++++++++++++-- src/p_setup.c | 1 + 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 07fbacfdf..496c4d701 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4399,8 +4399,7 @@ void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source) mobj_t *cachenext; killnext: - - if (!banana) + if (P_MobjWasRemovedCompat(banana)) return; cachenext = banana->hnext; @@ -4439,10 +4438,21 @@ void K_UpdateHnextList(player_t *player, boolean clean) nextwork = work->hnext; if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount])) + { continue; + } P_RemoveMobj(work); } + +#ifdef PHOBOS_BUILD + if (P_MobjWasRemoved(player->mo->hnext)) + { + // Like below, try to clean up the pointer if it's NULL. + // Maybe this was a cause of the shrink/eggbox fails? + P_SetTarget(&player->mo->hnext, NULL); + } +#endif } // For getting hit! @@ -4507,7 +4517,9 @@ void K_DropHnextList(player_t *player) } dropwork = P_SpawnMobj(work->x, work->y, work->z, type); + P_SetTarget(&dropwork->target, player->mo); + dropwork->angle = work->angle; dropwork->flags2 = work->flags2; dropwork->flags |= MF_NOCLIPTHING; @@ -4575,10 +4587,13 @@ void K_DropHnextList(player_t *player) // we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic... P_SetTarget(&player->mo->hnext, NULL); + player->kartstuff[k_bananadrag] = 0; if (player->kartstuff[k_eggmanheld]) + { player->kartstuff[k_eggmanheld] = 0; + } else if (player->kartstuff[k_itemheld] && (dropall || (--player->kartstuff[k_itemamount] <= 0))) { @@ -4879,7 +4894,9 @@ static void K_MoveHeldObjects(player_t *player) player->kartstuff[k_bananadrag] = 0; if (player->kartstuff[k_eggmanheld]) + { player->kartstuff[k_eggmanheld] = 0; + } else if (player->kartstuff[k_itemheld]) { player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; @@ -4896,7 +4913,9 @@ static void K_MoveHeldObjects(player_t *player) player->kartstuff[k_bananadrag] = 0; if (player->kartstuff[k_eggmanheld]) + { player->kartstuff[k_eggmanheld] = 0; + } else if (player->kartstuff[k_itemheld]) { player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; diff --git a/src/p_mobj.c b/src/p_mobj.c index fbb821e88..5b9deaaf7 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10338,13 +10338,25 @@ void P_RemoveMobj(mobj_t *mobj) if (!P_MobjWasRemoved(mobj->hnext)) { - P_SetTarget(&mobj->hnext->hprev, mobj->hprev); +#ifdef PHOBOS_BUILD + if (mobj->hnext->hprev == mobj) +#endif + { + P_SetTarget(&mobj->hnext->hprev, mobj->hprev); + } + P_SetTarget(&mobj->hnext, NULL); } if (!P_MobjWasRemoved(mobj->hprev)) { - P_SetTarget(&mobj->hprev->hnext, cachenext); +#ifdef PHOBOS_BUILD + if (mobj->hprev->hnext == mobj) +#endif + { + P_SetTarget(&mobj->hprev->hnext, cachenext); + } + P_SetTarget(&mobj->hprev, NULL); } diff --git a/src/p_setup.c b/src/p_setup.c index 2201c0b9f..2c1c1cfed 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3328,6 +3328,7 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i) return false; } + // // P_CheckReplacMapReplacements //