stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

You know what, let's make this less hacky.

Browse source
This commit is contained in:
toasterbabe 2016-10-24 13:52:36 +01:00
parent cc4d780371
commit a533701d85
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_user.c
View file

@ -6993,10 +6993,9 @@ 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
#if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible #if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible
P_SetObjectMomZ(player->mo, FixedDiv(-4*P_GetMobjGravity(player->mo), player->mo->scale), false); -4*P_GetMobjGravity(player->mo);
#else
player->mo->momz = // intentionally carries to post-endif line as multiple-assignment
#endif #endif
player->mo->momx = player->mo->momy = 0; player->mo->momx = player->mo->momy = 0;
S_StartSound(player->mo, sfx_ngskid); S_StartSound(player->mo, sfx_ngskid);