Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
This commit is contained in:
commit
652e53c629
|
@ -4635,7 +4635,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
|
||||||
S_StartSound(player->mo, sfx_spin);
|
S_StartSound(player->mo, sfx_spin);
|
||||||
break;
|
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)
|
#define chargecalculation (6*(player->dashspeed - player->mindash))/(player->maxdash - player->mindash)
|
||||||
fixed_t soundcalculation = chargecalculation;
|
fixed_t soundcalculation = chargecalculation;
|
||||||
|
|
Loading…
Reference in New Issue