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:
commit
ee48fa2de3
|
@ -1491,10 +1491,10 @@ void P_PlayLivesJingle(player_t *player)
|
||||||
if (player && !P_IsLocalPlayer(player))
|
if (player && !P_IsLocalPlayer(player))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (use1upSound || cv_1upsound.value)
|
if (mariomode)
|
||||||
S_StartSound(NULL, sfx_oneup);
|
|
||||||
else if (mariomode)
|
|
||||||
S_StartSound(NULL, sfx_marioa);
|
S_StartSound(NULL, sfx_marioa);
|
||||||
|
else if (use1upSound || cv_1upsound.value)
|
||||||
|
S_StartSound(NULL, sfx_oneup);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
P_PlayJingle(player, JT_1UP);
|
P_PlayJingle(player, JT_1UP);
|
||||||
|
|
Loading…
Reference in New Issue