stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-06 16:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweaks to the way the force whoosh is handled so it stays centered AND doesn't allow an infinitesimal jump.

Browse source
This commit is contained in:
toasterbabe 2016-10-30 14:01:56 +00:00
parent 5a798bddbd
commit 08a4fc8382
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_mobj.c
View file

@ -6824,6 +6824,7 @@ void P_MobjThinker(mobj_t *mobj)
whoosh->height = 38*whoosh->scale; whoosh->height = 38*whoosh->scale;
whoosh->fuse = 10; whoosh->fuse = 10;
whoosh->flags |= MF_NOCLIPHEIGHT; whoosh->flags |= MF_NOCLIPHEIGHT;
whoosh->momz = mobj->target->momz; // Stay reasonably centered for a few frames
mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh
} }
case MT_FLAMEAURA_ORB: case MT_FLAMEAURA_ORB:

6
src/p_user.c
View file

@ -6992,11 +6992,7 @@ static void P_MovePlayer(player_t *player)
if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE) if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE)
{ {
player->pflags |= PF_THOKKED|PF_SHIELDABILITY; player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
player->mo->momz = // would intentionally carry to post-endif line as multiple-assignment player->mo->momx = player->mo->momy = player->mo->momz = 0;
#if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible
-4*P_GetMobjGravity(player->mo);
#endif
player->mo->momx = player->mo->momy = 0;
S_StartSound(player->mo, sfx_ngskid); S_StartSound(player->mo, sfx_ngskid);
} }
else else