From f5a0e01b2c2e8a9c42f44b50088da4b748e4c7b0 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 30 Oct 2024 00:37:08 +0100 Subject: [PATCH] Support STARTUPSONG for the generic startupscreen --- src/common/startscreen/startscreen_generic.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/common/startscreen/startscreen_generic.cpp b/src/common/startscreen/startscreen_generic.cpp index 362073a4e..68eda4dec 100644 --- a/src/common/startscreen/startscreen_generic.cpp +++ b/src/common/startscreen/startscreen_generic.cpp @@ -40,6 +40,7 @@ #include "texturemanager.h" #include "v_video.h" #include "v_draw.h" +#include "s_music.h" // Hexen startup screen #define ST_PROGRESS_X 64 // Start of notches x screen pos. @@ -87,6 +88,14 @@ FGenericStartScreen::FGenericStartScreen(int max_progress) DrawTexture(twod, tex, imgx, imgy, DTA_DestWidthF, imgwidth, DTA_DestHeightF, imgheight, DTA_VirtualWidthF, scrwidth, DTA_VirtualHeightF, scrheight, DTA_KeepRatio, true, TAG_END); }); + + if (!batchrun) + { + if (GameStartupInfo.Song.IsNotEmpty()) + { + S_ChangeMusic(GameStartupInfo.Song.GetChars(), true, true); + } + } } //==========================================================================