Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features

This commit is contained in:
Zachary McAlpin 2019-12-19 17:20:31 -06:00
commit 652e53c629
1 changed files with 1 additions and 1 deletions

View File

@ -4635,7 +4635,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
S_StartSound(player->mo, sfx_spin);
break;
}
if (player->dashspeed < player->maxdash)
if (player->dashspeed < player->maxdash && player->mindash != player->maxdash)
{
#define chargecalculation (6*(player->dashspeed - player->mindash))/(player->maxdash - player->mindash)
fixed_t soundcalculation = chargecalculation;