lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'restoreskinsounds' into 'master'

Browse source 
Restore spindash sounds to DSSPNDSH

See merge request STJr/SRB2Internal!579
This commit is contained in:
MascaraSnake 2019-11-30 06:52:53 -05:00
parent cfe8166998 d46f022837
commit c422ef3c4e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_user.c
View file

@ -4623,7 +4623,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
player->dashspeed = player->mindash; player->dashspeed = player->mindash;
P_SetPlayerMobjState(player->mo, S_PLAY_SPINDASH); P_SetPlayerMobjState(player->mo, S_PLAY_SPINDASH);
if (!player->spectator) if (!player->spectator)
S_StartSound(player->mo, sfx_s3kab); // Make the rev sound! Previously sfx_spndsh. S_StartSound(player->mo, sfx_spndsh); // Make the rev sound!
} }
// Revving // Revving
else if ((cmd->buttons & BT_USE) && (player->pflags & PF_STARTDASH)) else if ((cmd->buttons & BT_USE) && (player->pflags & PF_STARTDASH))
@ -4641,7 +4641,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
fixed_t soundcalculation = chargecalculation; fixed_t soundcalculation = chargecalculation;
player->dashspeed += FRACUNIT; player->dashspeed += FRACUNIT;
if (!player->spectator && soundcalculation != chargecalculation) if (!player->spectator && soundcalculation != chargecalculation)
S_StartSound(player->mo, sfx_s3kab); // Make the rev sound! Previously sfx_spndsh. S_StartSound(player->mo, sfx_spndsh); // Make the rev sound!
#undef chargecalculation #undef chargecalculation
} }
if (player->revitem && !(leveltime % 5)) // Now spawn the color thok circle. if (player->revitem && !(leveltime % 5)) // Now spawn the color thok circle.