Merge branch 'tutorial-profile-music' into 'master'

Let Profile menu music play in the Tutorial

Closes #1073

See merge request KartKrew/Kart!1958
This commit is contained in:
Oni 2024-02-28 01:09:38 +00:00
commit abc2892b15

View file

@ -436,8 +436,7 @@ void M_PlayMenuJam(void)
const boolean trulystarted = M_GameTrulyStarted();
const boolean profilemode = (
trulystarted
&& optionsmenu.profilemenu
optionsmenu.profilemenu
&& !optionsmenu.resetprofilemenu
);
@ -449,7 +448,9 @@ void M_PlayMenuJam(void)
return;
}
if (!trulystarted)
// trulystarted == false in the Tutorial.
// But profile menu music should play during the Tutorial (Playing()).
if (!trulystarted && !Playing())
{
if (M_GonerMusicPlayable() && NotCurrentlyPlaying("_GONER"))
{