thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Teleport bubble trap overlay after slowing down rather than before

Browse source
This commit is contained in:
Sally Cochenour 2020-03-17 20:47:05 -04:00
parent dad1d7b610
commit c313de326e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_mobj.c
View file

@ -9467,11 +9467,6 @@ void P_MobjThinker(mobj_t *mobj)
mobj->flags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_DONTENCOREMAP; mobj->flags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_DONTENCOREMAP;
mobj->extravalue1 = 1; mobj->extravalue1 = 1;
P_TeleportMove(mobj,
mobj->tracer->x + mobj->tracer->momx + P_ReturnThrustX(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<<FRACBITS),
mobj->tracer->y + mobj->tracer->momy + P_ReturnThrustY(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<<FRACBITS),
mobj->tracer->z + mobj->tracer->momz - (4*mobj->tracer->scale) + (P_RandomRange(-abs(mobj->cvmem), abs(mobj->cvmem))<<FRACBITS));
mobj->cvmem /= 2; mobj->cvmem /= 2;
mobj->momz = 0; mobj->momz = 0;
mobj->destscale = ((5*mobj->tracer->scale)>>2) + (mobj->tracer->scale>>3); 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->momy = (63*mobj->tracer->momy)/64;
mobj->tracer->momz = (8*mobj->tracer->scale) * P_MobjFlip(mobj->tracer); 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)<<FRACBITS),
mobj->tracer->y + mobj->tracer->momy + P_ReturnThrustY(NULL, mobj->tracer->angle+ANGLE_90, (mobj->cvmem)<<FRACBITS),
mobj->tracer->z + mobj->tracer->momz - (4*mobj->tracer->scale) + (P_RandomRange(-abs(mobj->cvmem), abs(mobj->cvmem))<<FRACBITS));
if (mobj->movecount > 8*TICRATE) if (mobj->movecount > 8*TICRATE)
{ {
S_StartSound(mobj->tracer, sfx_s3k77); S_StartSound(mobj->tracer, sfx_s3k77);