From c313de326ed9cba3cbd1dc5d185c1bee563f0a23 Mon Sep 17 00:00:00 2001 From: Sally Cochenour Date: Tue, 17 Mar 2020 20:47:05 -0400 Subject: [PATCH] Teleport bubble trap overlay after slowing down rather than before --- src/p_mobj.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 70b97f851..d8baad638 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9467,11 +9467,6 @@ void P_MobjThinker(mobj_t *mobj) mobj->flags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_DONTENCOREMAP; mobj->extravalue1 = 1; - P_TeleportMove(mobj, - mobj->tracer->x + mobj->tracer->momx + P_ReturnThrustX(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<tracer->y + mobj->tracer->momy + P_ReturnThrustY(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<tracer->z + mobj->tracer->momz - (4*mobj->tracer->scale) + (P_RandomRange(-abs(mobj->cvmem), abs(mobj->cvmem))<cvmem /= 2; mobj->momz = 0; mobj->destscale = ((5*mobj->tracer->scale)>>2) + (mobj->tracer->scale>>3); @@ -9480,6 +9475,11 @@ void P_MobjThinker(mobj_t *mobj) mobj->tracer->momy = (63*mobj->tracer->momy)/64; mobj->tracer->momz = (8*mobj->tracer->scale) * P_MobjFlip(mobj->tracer); + P_TeleportMove(mobj, + mobj->tracer->x + mobj->tracer->momx + P_ReturnThrustX(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<tracer->y + mobj->tracer->momy + P_ReturnThrustY(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<tracer->z + mobj->tracer->momz - (4*mobj->tracer->scale) + (P_RandomRange(-abs(mobj->cvmem), abs(mobj->cvmem))<movecount > 8*TICRATE) { S_StartSound(mobj->tracer, sfx_s3k77);