lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'protect-wrists' into 'next'

Browse source 
Remove flight cutoff property

See merge request STJr/SRB2!748
This commit is contained in:
James R 2020-02-01 21:41:33 -05:00
parent bd6438dda1 f5e49ace00
commit 5c8406f6d7
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_user.c
View file

@ -5503,10 +5503,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
; // Can't do anything if you're a fish out of water! ; // Can't do anything if you're a fish out of water!
else if (player->powers[pw_tailsfly]) // If currently flying, give an ascend boost. else if (player->powers[pw_tailsfly]) // If currently flying, give an ascend boost.
{ {
if (!player->fly1) player->fly1 = 20;
player->fly1 = 20;
else
player->fly1 = 2;
if (player->charability == CA_SWIM) if (player->charability == CA_SWIM)
player->fly1 /= 2; player->fly1 /= 2;
@ -8487,7 +8484,11 @@ static void P_MovePlayer(player_t *player)
// Descend // Descend
if (cmd->buttons & BT_USE && !(player->pflags & PF_STASIS) && !player->exiting && !(player->mo->eflags & MFE_GOOWATER)) if (cmd->buttons & BT_USE && !(player->pflags & PF_STASIS) && !player->exiting && !(player->mo->eflags & MFE_GOOWATER))
if (P_MobjFlip(player->mo)*player->mo->momz > -FixedMul(5*actionspd, player->mo->scale)) if (P_MobjFlip(player->mo)*player->mo->momz > -FixedMul(5*actionspd, player->mo->scale))
{
if (player->fly1 > 2)
player->fly1 = 2;
P_SetObjectMomZ(player->mo, -actionspd/2, true); P_SetObjectMomZ(player->mo, -actionspd/2, true);
}
} }
else else