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

Merge branch 'mario1up' into 'next' 

Fix normal one-up sound playing in Mario mode

See merge request STJr/SRB2!1272
This commit is contained in:
James R 2020-12-10 15:15:08 -05:00
parent 9a77cf6306 db6b0c6aa0
commit ee48fa2de3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/p_user.c
View File

@ -1491,10 +1491,10 @@ void P_PlayLivesJingle(player_t *player)
if (player && !P_IsLocalPlayer(player))
return;
if (use1upSound || cv_1upsound.value)
S_StartSound(NULL, sfx_oneup);
else if (mariomode)
if (mariomode)
S_StartSound(NULL, sfx_marioa);
else if (use1upSound || cv_1upsound.value)
S_StartSound(NULL, sfx_oneup);
else
{
P_PlayJingle(player, JT_1UP);