Fix vwoops not properly clipping through stuff

This commit is contained in:
toaster 2020-09-22 15:07:12 +01:00
parent eb48f71f89
commit 1ec6240001

View file

@ -3457,9 +3457,8 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
// Zoom tube
if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer))
{
if (mobj->player->powers[pw_carry] == CR_ZOOMTUBE || mobj->player->respawn.state == RESPAWNST_MOVE)
if ((mobj->player->powers[pw_carry] == CR_ZOOMTUBE && mobj->tracer && !P_MobjWasRemoved(mobj->tracer))
|| mobj->player->respawn.state == RESPAWNST_MOVE)
{
P_HitSpecialLines(mobj, mobj->x, mobj->y, mobj->momx, mobj->momy);
P_UnsetThingPosition(mobj);
@ -3472,7 +3471,6 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
mobj->ceilingz = tmceilingz;
goto animonly;
}
}
// Needed for gravity boots
P_CheckGravity(mobj, false);