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

Fix to the previous commit to basically do what I wanted it to do as opposed to accidentially altering behaviour of jumping on crawlas.

Browse source
This commit is contained in:
toasterbabe 2016-10-21 11:31:44 +01:00
parent a053b117e1
commit b34dc93a18
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_user.c
View file

@ -4361,10 +4361,10 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
player->secondjump = 2; player->secondjump = 2;
if (player->pflags & PF_JUMPED && player->jumping == 1) // If letting go of the jump button while still on ascent, cut the jump height.
if (player->pflags & PF_JUMPED && P_MobjFlip(player->mo)*player->mo->momz > 0 && player->jumping == 1)
{ {
if (P_MobjFlip(player->mo)*player->mo->momz > 0) player->mo->momz >>= 1;
player->mo->momz >>= 1; // If letting go of the jump button while still on ascent, cut the jump height.
player->jumping = 0; player->jumping = 0;
} }
} }
@ -7077,7 +7077,7 @@ static void P_MovePlayer(player_t *player)
} }
} }
} }
else if (cmd->buttons & BT_JUMP && !player->jumping) // Super Sonic move else if ((cmd->buttons & BT_JUMP) && (player->pflags & PF_THOKKED)) // Super Sonic move
{ {
if (player->skin == 0 && player->powers[pw_super] && player->speed > FixedMul(5<<FRACBITS, player->mo->scale) if (player->skin == 0 && player->powers[pw_super] && player->speed > FixedMul(5<<FRACBITS, player->mo->scale)
&& P_MobjFlip(player->mo)*player->mo->momz <= 0) && P_MobjFlip(player->mo)*player->mo->momz <= 0)