From 296e974e9d795e8df34a62958dce95ca50e9ff4b Mon Sep 17 00:00:00 2001 From: SteelT Date: Tue, 18 Aug 2020 15:09:09 -0400 Subject: [PATCH] Fix the title music being played early --- src/f_finale.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index 91024aaae..14e644bce 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1819,11 +1819,6 @@ static void F_CacheTitleScreen(void) void F_StartTitleScreen(void) { - if (menupres[MN_MAIN].musname[0]) - S_ChangeMusic(menupres[MN_MAIN].musname, menupres[MN_MAIN].mustrack, menupres[MN_MAIN].muslooping); - else - S_ChangeMusicInternal("_title", looptitle); - if (gamestate != GS_TITLESCREEN && gamestate != GS_WAITINGPLAYERS) { ttuser_count = 0; @@ -2027,7 +2022,10 @@ void F_TitleScreenTicker(boolean run) else if (finalecount == 50) { // Now start the music - S_ChangeMusicInternal("titles", looptitle); + if (menupres[MN_MAIN].musname[0]) + S_ChangeMusic(menupres[MN_MAIN].musname, menupres[MN_MAIN].mustrack, menupres[MN_MAIN].muslooping); + else + S_ChangeMusicInternal("_title", looptitle); S_StartSound(NULL, sfx_s23c); } }