Noclip properly

This commit is contained in:
Sally Coolatta 2020-05-29 11:41:39 -04:00
parent 0879459142
commit 2bfe5c9dd2

View file

@ -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);