From 2bfe5c9dd2fe67bb67de9a860ea76bb49f539a3e Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Fri, 29 May 2020 11:41:39 -0400 Subject: [PATCH] Noclip properly --- src/p_mobj.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 35eea0e18..96a1c7a0c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3750,7 +3750,8 @@ static void P_PlayerMobjThinker(mobj_t *mobj) mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN; // Zoom tube - if (mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT) + if ((mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT) + || (mobj->player->respawnvars.respawnstate == RESPAWNST_MOVE)) { P_UnsetThingPosition(mobj); mobj->x += mobj->momx; @@ -11878,9 +11879,6 @@ void P_SpawnPlayer(INT32 playernum) // Spawn with a pity shield if necessary. //P_DoPityCheck(p); - if (p->respawnvars.respawnstate != RESPAWNST_NONE) - p->mo->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY; - if (G_BattleGametype()) // SRB2kart { mobj_t *overheadarrow = P_SpawnMobj(mobj->x, mobj->y, mobj->z + P_GetPlayerHeight(p)+16*FRACUNIT, MT_PLAYERARROW);