Profile selection music

- `_OCEAN` on first launch without profile set, to avoid skipping between three different tracks in quick succession
- 'FILE' if you create a new profile on first launch OR if you go into Options->Profiles
This commit is contained in:
toaster 2023-05-19 23:10:13 +01:00
parent ca68fe630b
commit d86743f0ba
6 changed files with 10 additions and 6 deletions

View file

@ -564,6 +564,9 @@ void M_StartControlPanel(void)
currentMenu->lastOn = 0;
CV_StealthSetValue(&cv_currprofile, -1); // Make sure to reset that as it is set by PR_ApplyProfile which we kind of hack together to force it.
// Ambient ocean sounds
S_ChangeMusicInternal("_OCEAN", true);
}
else
{
@ -571,9 +574,9 @@ void M_StartControlPanel(void)
restoreMenu = &MainDef;
currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu));
restoreMenu = NULL;
}
M_PlayMenuJam();
M_PlayMenuJam();
}
}
else
{

View file

@ -16,7 +16,7 @@ menu_t MAIN_ProfilesDef = {
32, 80,
SKINCOLOR_ULTRAMARINE, 0,
0,
NULL,
"FILE",
2, 5,
M_DrawProfileSelect,
M_OptionsTick,

View file

@ -18,7 +18,7 @@ menu_t OPTIONS_ProfilesDef = {
32, 80,
SKINCOLOR_ULTRAMARINE, 0,
0,
NULL,
"FILE",
2, 5,
M_DrawProfileSelect,
M_OptionsTick,

View file

@ -30,7 +30,7 @@ menu_t OPTIONS_EditProfileDef = {
32, 80,
SKINCOLOR_ULTRAMARINE, 0,
0,
NULL,
"FILE",
2, 5,
M_DrawEditProfile,
M_HandleProfileEdit,

View file

@ -109,7 +109,7 @@ menu_t OPTIONS_ProfileControlsDef = {
32, 80,
SKINCOLOR_ULTRAMARINE, 0,
0,
NULL,
"FILE",
3, 5,
M_DrawProfileControls,
M_HandleProfileControls,

View file

@ -497,6 +497,7 @@ void M_CharacterSelectInit(void)
void M_CharacterSelect(INT32 choice)
{
(void)choice;
PLAY_CharSelectDef.music = currentMenu->music;
PLAY_CharSelectDef.prevMenu = currentMenu;
M_SetupNextMenu(&PLAY_CharSelectDef, false);
}