mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 04:21:47 +00:00
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:
parent
ca68fe630b
commit
d86743f0ba
6 changed files with 10 additions and 6 deletions
|
|
@ -564,6 +564,9 @@ void M_StartControlPanel(void)
|
||||||
currentMenu->lastOn = 0;
|
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.
|
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
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -571,9 +574,9 @@ void M_StartControlPanel(void)
|
||||||
restoreMenu = &MainDef;
|
restoreMenu = &MainDef;
|
||||||
currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu));
|
currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu));
|
||||||
restoreMenu = NULL;
|
restoreMenu = NULL;
|
||||||
}
|
|
||||||
|
|
||||||
M_PlayMenuJam();
|
M_PlayMenuJam();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ menu_t MAIN_ProfilesDef = {
|
||||||
32, 80,
|
32, 80,
|
||||||
SKINCOLOR_ULTRAMARINE, 0,
|
SKINCOLOR_ULTRAMARINE, 0,
|
||||||
0,
|
0,
|
||||||
NULL,
|
"FILE",
|
||||||
2, 5,
|
2, 5,
|
||||||
M_DrawProfileSelect,
|
M_DrawProfileSelect,
|
||||||
M_OptionsTick,
|
M_OptionsTick,
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ menu_t OPTIONS_ProfilesDef = {
|
||||||
32, 80,
|
32, 80,
|
||||||
SKINCOLOR_ULTRAMARINE, 0,
|
SKINCOLOR_ULTRAMARINE, 0,
|
||||||
0,
|
0,
|
||||||
NULL,
|
"FILE",
|
||||||
2, 5,
|
2, 5,
|
||||||
M_DrawProfileSelect,
|
M_DrawProfileSelect,
|
||||||
M_OptionsTick,
|
M_OptionsTick,
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ menu_t OPTIONS_EditProfileDef = {
|
||||||
32, 80,
|
32, 80,
|
||||||
SKINCOLOR_ULTRAMARINE, 0,
|
SKINCOLOR_ULTRAMARINE, 0,
|
||||||
0,
|
0,
|
||||||
NULL,
|
"FILE",
|
||||||
2, 5,
|
2, 5,
|
||||||
M_DrawEditProfile,
|
M_DrawEditProfile,
|
||||||
M_HandleProfileEdit,
|
M_HandleProfileEdit,
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ menu_t OPTIONS_ProfileControlsDef = {
|
||||||
32, 80,
|
32, 80,
|
||||||
SKINCOLOR_ULTRAMARINE, 0,
|
SKINCOLOR_ULTRAMARINE, 0,
|
||||||
0,
|
0,
|
||||||
NULL,
|
"FILE",
|
||||||
3, 5,
|
3, 5,
|
||||||
M_DrawProfileControls,
|
M_DrawProfileControls,
|
||||||
M_HandleProfileControls,
|
M_HandleProfileControls,
|
||||||
|
|
|
||||||
|
|
@ -497,6 +497,7 @@ void M_CharacterSelectInit(void)
|
||||||
void M_CharacterSelect(INT32 choice)
|
void M_CharacterSelect(INT32 choice)
|
||||||
{
|
{
|
||||||
(void)choice;
|
(void)choice;
|
||||||
|
PLAY_CharSelectDef.music = currentMenu->music;
|
||||||
PLAY_CharSelectDef.prevMenu = currentMenu;
|
PLAY_CharSelectDef.prevMenu = currentMenu;
|
||||||
M_SetupNextMenu(&PLAY_CharSelectDef, false);
|
M_SetupNextMenu(&PLAY_CharSelectDef, false);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue