Merge branch 'fix-superfloat' into 'next'

Fix Super Sonic exploiting CA_FLOAT abilities

See merge request STJr/SRB2!1081
This commit is contained in:
James R 2020-07-22 22:13:51 -04:00
commit 4d16f16dab
1 changed files with 1 additions and 1 deletions

View File

@ -5536,7 +5536,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
if ((!(gametyperules & GTR_TEAMFLAGS) || !player->gotflag) && !player->exiting) if ((!(gametyperules & GTR_TEAMFLAGS) || !player->gotflag) && !player->exiting)
{ {
if (player->secondjump == 1 && player->charability != CA_DOUBLEJUMP) if (player->secondjump == 1 && player->charability != CA_DOUBLEJUMP && player->charability != CA_THOK)
{ {
fixed_t potentialmomz; fixed_t potentialmomz;
if (player->charability == CA_SLOWFALL) if (player->charability == CA_SLOWFALL)