Merge branch 'next' into 2.2.3-prep
This commit is contained in:
commit
fabd76a5fe
|
@ -991,6 +991,7 @@ static void IdentifyVersion(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
MUSICTEST("music.dta")
|
MUSICTEST("music.dta")
|
||||||
|
MUSICTEST("patch_music.pk3")
|
||||||
#ifdef DEVELOP // remove when music_new.dta is merged into music.dta
|
#ifdef DEVELOP // remove when music_new.dta is merged into music.dta
|
||||||
MUSICTEST("music_new.dta")
|
MUSICTEST("music_new.dta")
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1490,17 +1490,10 @@ void P_PlayLivesJingle(player_t *player)
|
||||||
if (player && !P_IsLocalPlayer(player))
|
if (player && !P_IsLocalPlayer(player))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (use1upSound)
|
if (use1upSound || cv_1upsound.value)
|
||||||
S_StartSound(NULL, sfx_oneup);
|
S_StartSound(NULL, sfx_oneup);
|
||||||
else if (mariomode)
|
else if (mariomode)
|
||||||
S_StartSound(NULL, sfx_marioa);
|
S_StartSound(NULL, sfx_marioa);
|
||||||
else if (cv_1upsound.value)
|
|
||||||
{
|
|
||||||
if (S_sfx[sfx_oneup].lumpnum != LUMPERROR)
|
|
||||||
S_StartSound(NULL, sfx_oneup);
|
|
||||||
else
|
|
||||||
S_StartSound(NULL, sfx_chchng);/* at least play something! */
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
P_PlayJingle(player, JT_1UP);
|
P_PlayJingle(player, JT_1UP);
|
||||||
|
|
Loading…
Reference in a new issue