From 94f46c3ce68c5d8e8c6eb331455aaf1195d766bd Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 25 Jul 2026 09:22:51 +0200 Subject: [PATCH 1/2] also prevent "local" pushable mobjs from executing linedef actions missed when i did the other, pushables have a seperate executor special --- src/p_mobj.c | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index cc62c6cab..03b821d3e 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9150,15 +9150,17 @@ void P_MobjThinker(mobj_t *mobj) tmfloorthing = tmhitthing = NULL; - const sector_t *sec1 = mobj->subsector ? mobj->subsector->sector : NULL; - - // 970 allows ANY mobj to trigger a linedef exec - if (!mobj->islocal && sec1 && GETSECSPECIAL(sec1->special, 2) == 8) // BEWARE: islocal does not exist in vanilla + // do NOT trigger linedef executors for "local" mobjs + if (!mobj->islocal) { - sector_t *sec2; - sec2 = P_ThingOnSpecial3DFloor(mobj); - if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) - P_LinedefExecute(sec2->tag, mobj, sec2); + // 970 allows ANY mobj to trigger a linedef exec + if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8) + { + sector_t *sec2; + sec2 = P_ThingOnSpecial3DFloor(mobj); + if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) + P_LinedefExecute(sec2->tag, mobj, sec2); + } } if (mobj->scale != mobj->destscale) @@ -9358,25 +9360,29 @@ void P_PushableThinker(mobj_t *mobj) I_Assert(!P_MobjWasRemoved(mobj)); - if (P_MobjWasRemovedCompat(mobj)) - return; - - sec = mobj->subsector->sector; - - if (mobj->z == sec->floorheight && GETSECSPECIAL(sec->special, 2) == 1) - P_LinedefExecute(sec->tag, mobj, sec); + // do NOT trigger linedef executors for "local" mobjs + if (!mobj->islocal) { - sector_t *sec2; + sec = mobj->subsector->sector; - sec2 = P_ThingOnSpecial3DFloor(mobj); - if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) - P_LinedefExecute(sec2->tag, mobj, sec2); + if (mobj->z == sec->floorheight && GETSECSPECIAL(sec->special, 2) == 1) + P_LinedefExecute(sec->tag, mobj, sec); + { + sector_t *sec2; + + sec2 = P_ThingOnSpecial3DFloor(mobj); + if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) + P_LinedefExecute(sec2->tag, mobj, sec2); + } } // it has to be pushable RIGHT NOW for this part to happen if (mobj->flags & MF_PUSHABLE && !(mobj->momx || mobj->momy)) P_TryMove(mobj, mobj->x, mobj->y, true); + if (P_MobjWasRemovedCompat(mobj)) + return; + if (mobj->fuse == 1) // it would explode in the MobjThinker code { mobj_t *spawnmo; @@ -9402,7 +9408,8 @@ void P_PushableThinker(mobj_t *mobj) } spawnmo = P_SpawnMobj(x, y, z, mobj->type); - if (spawnmo) + + if (!P_MobjWasRemovedCompat(spawnmo)) { spawnmo->spawnpoint = mobj->spawnpoint; P_UnsetThingPosition(spawnmo); From d5252bd3b38c2dcaa261ee73eb3527ffada43ca5 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 28 Jul 2026 20:49:23 +0200 Subject: [PATCH 2/2] fix an oopsie in p_mobj.c prob did that while sleep deprived, P_WeaponOrPanel includes a few more things than intended to be there doubt we even use any of those, but i dont want to cause any potential issues agaion --- src/p_mobj.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 03b821d3e..dbfe3d596 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9264,7 +9264,8 @@ void P_MobjThinker(mobj_t *mobj) mobj->eflags &= ~MFE_JUSTHITFLOOR; } - if (mobj->type == MT_FALLINGROCK + // Sliding physics for slidey mobjs! + if ( mobj->type == MT_FALLINGROCK || mobj->type == MT_LITTLETUMBLEWEED || mobj->type == MT_BIGTUMBLEWEED || mobj->type == MT_FLINGRING @@ -9309,21 +9310,24 @@ void P_MobjThinker(mobj_t *mobj) if (P_MobjWasRemoved(mobj)) return; - if (P_WeaponOrPanel(mobj->type)) + if ((mobj->health == 0) && // Fading tile + (mobj->type == MT_BOUNCEPICKUP + || mobj->type == MT_RAILPICKUP + || mobj->type == MT_AUTOPICKUP + || mobj->type == MT_EXPLODEPICKUP + || mobj->type == MT_SCATTERPICKUP + || mobj->type == MT_GRENADEPICKUP)) { - if (mobj->health == 0) // Fading tile - { - INT32 value = mobj->info->damage/10; - value = mobj->fuse/value; - value = 10-value; - value--; + INT32 value = mobj->info->damage/10; + value = mobj->fuse/value; + value = 10-value; + value--; - if (value <= 0) - value = 1; + if (value <= 0) + value = 1; - mobj->frame &= ~FF_TRANSMASK; - mobj->frame |= value << FF_TRANSSHIFT; - } + mobj->frame &= ~FF_TRANSMASK; + mobj->frame |= value << FF_TRANSSHIFT; } }