From 7c7f5ac1d0b2ffcc498a918d8cde4df57de16d2f Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 14 Sep 2025 15:38:12 -0400 Subject: [PATCH] Revert "Only run fallback traversal for bounce and slide for gameplay important objects" This reverts commit 15b83e9fc36f051cadfd95cfb8c643bbb31f05be. --- src/p_map.c | 68 ++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index 075a80090..eaeb8359e 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -3420,28 +3420,25 @@ void P_SlideMove(mobj_t *mo, TryMoveResult_t *result) if (bestslideline == NULL) { - if (K_IsMissileOrKartItem(mo)) + if (cv_showgremlins.value) { - if (cv_showgremlins.value) - { - // debug - mobj_t*x = P_SpawnMobj(mo->x, mo->y, mo->z, MT_THOK); - x->frame = FF_FULLBRIGHT | FF_ADD; - x->renderflags = RF_ALWAYSONTOP; - x->color = SKINCOLOR_RED; + // debug + mobj_t*x = P_SpawnMobj(mo->x, mo->y, mo->z, MT_THOK); + x->frame = FF_FULLBRIGHT | FF_ADD; + x->renderflags = RF_ALWAYSONTOP; + x->color = SKINCOLOR_RED; - CONS_Printf( - "SLIDE GREMLIN: leveltime=%u x=%f y=%f z=%f", - leveltime, - FixedToFloat(mo->x), - FixedToFloat(mo->y), - FixedToFloat(mo->z) - ); - } - - // We were not succesful, try the old version. - P_SlideMoveOLD(mo); + CONS_Printf( + "SLIDE GREMLIN: leveltime=%u x=%f y=%f z=%f", + leveltime, + FixedToFloat(mo->x), + FixedToFloat(mo->y), + FixedToFloat(mo->z) + ); } + + // We were not succesful, try the old version. + P_SlideMoveOLD(mo); return; } @@ -4183,27 +4180,24 @@ void P_BounceMove(mobj_t *mo, TryMoveResult_t *result) if (bestslideline == NULL) { - if (K_IsMissileOrKartItem(mo)) + if (cv_showgremlins.value) { - if (cv_showgremlins.value) - { - // debug - mobj_t*x = P_SpawnMobj(mo->x, mo->y, mo->z, MT_THOK); - x->frame = FF_FULLBRIGHT | FF_ADD; - x->renderflags = RF_ALWAYSONTOP; - x->color = SKINCOLOR_RED; + // debug + mobj_t*x = P_SpawnMobj(mo->x, mo->y, mo->z, MT_THOK); + x->frame = FF_FULLBRIGHT | FF_ADD; + x->renderflags = RF_ALWAYSONTOP; + x->color = SKINCOLOR_RED; - CONS_Printf( - "BOUNCE GREMLIN: leveltime=%u x=%f y=%f z=%f\n", - leveltime, - FixedToFloat(mo->x), - FixedToFloat(mo->y), - FixedToFloat(mo->z)); - } - - // We were not succesful, try the old version. - P_BounceMoveOLD(mo); + CONS_Printf( + "BOUNCE GREMLIN: leveltime=%u x=%f y=%f z=%f\n", + leveltime, + FixedToFloat(mo->x), + FixedToFloat(mo->y), + FixedToFloat(mo->z)); } + + // We were not succesful, try the old version. + P_BounceMoveOLD(mo); return; }