From 60106f1e37084608b19dce08a249f3c87ecf8976 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 24 Apr 2015 00:10:00 +0000 Subject: [PATCH] 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 --- polymer/eduke32/source/sounds.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/source/sounds.c b/polymer/eduke32/source/sounds.c index a57a27814..847493b50 100644 --- a/polymer/eduke32/source/sounds.c +++ b/polymer/eduke32/source/sounds.c @@ -163,8 +163,9 @@ void S_RestartMusic(void) if (MapInfo[g_musicIndex].musicfn != NULL) 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); } }