zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Menus: When toggling Music in the Sound menu, respect the LOGO_PLAYMUSIC flag in LOGO_FLAGS for the main menu. 

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5164 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-04-24 00:10:00 +00:00
parent c47ebac6c1
commit 60106f1e37
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
polymer/eduke32/source/sounds.c
View File

@ -163,8 +163,9 @@ void S_RestartMusic(void)
if (MapInfo[g_musicIndex].musicfn != NULL) if (MapInfo[g_musicIndex].musicfn != NULL)
S_PlayMusic(MapInfo[g_musicIndex].musicfn); S_PlayMusic(MapInfo[g_musicIndex].musicfn);
} }
else if (MapInfo[MUS_INTRO].musicfn != 0) else if (MapInfo[MUS_INTRO].musicfn != 0 && (G_GetLogoFlags() & LOGO_PLAYMUSIC))
{ {
g_musicIndex = MUS_INTRO;
S_PlayMusic(MapInfo[MUS_INTRO].musicfn); S_PlayMusic(MapInfo[MUS_INTRO].musicfn);
} }
} }