Merge branch 'slowball' into 'next'

Make CA_SLOWFALL Account for Scale

See merge request STJr/SRB2!1806
This commit is contained in:
Eidolon 2022-11-14 02:23:39 +00:00
commit c582d73e4c

View file

@ -5543,7 +5543,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{
fixed_t potentialmomz;
if (player->charability == CA_SLOWFALL)
potentialmomz = -gravity*4;
potentialmomz = FixedMul(gravity, -4*player->mo->scale);
else
potentialmomz = ((player->speed < 10*player->mo->scale)
? (player->speed - 10*player->mo->scale)/5