Merge branch 'dashaction' into 'next'

Scale minimum dashmode thok speed on actionspd, not normalspeed

See merge request STJr/SRB2!1311
This commit is contained in:
sphere 2021-05-10 08:45:26 -04:00
commit d915da6509

View file

@ -5301,7 +5301,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
fixed_t actionspd = player->actionspd;
if (player->charflags & SF_DASHMODE)
actionspd = max(player->normalspeed, FixedDiv(player->speed, player->mo->scale));
actionspd = max(player->actionspd, FixedDiv(player->speed, player->mo->scale));
if (player->mo->eflags & MFE_UNDERWATER)
actionspd >>= 1;