mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'title-profile-tweaks' into 'master'
Small fixes for profile selection and skipping title screen See merge request KartKrew/Kart!895
This commit is contained in:
commit
5664c8addc
3 changed files with 2 additions and 3 deletions
|
|
@ -1513,7 +1513,7 @@ boolean G_Responder(event_t *ev)
|
|||
if (gameaction == ga_nothing && !demo.quitafterplaying &&
|
||||
((demo.playback && !modeattacking && !demo.title && !multiplayer) || gamestate == GS_TITLESCREEN))
|
||||
{
|
||||
if (ev->type == ev_keydown && ev->data1 != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE))
|
||||
if (ev->type == ev_keydown)
|
||||
{
|
||||
M_StartControlPanel();
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -414,8 +414,6 @@ void M_StartControlPanel(void)
|
|||
optionsmenu.profilen = cv_ttlprofilen.value;
|
||||
|
||||
// options don't need initializing here.
|
||||
PR_ApplyProfile(0, 0); // apply guest profile to player 0 by default.
|
||||
// this is to garantee that the controls aren't fucked up.
|
||||
|
||||
// make sure we don't overstep that.
|
||||
if (optionsmenu.profilen > PR_GetNumProfiles())
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ void M_ProfileSelectInit(INT32 choice)
|
|||
{
|
||||
(void)choice;
|
||||
optionsmenu.profilemenu = true;
|
||||
optionsmenu.profilen = cv_currprofile.value;
|
||||
|
||||
M_SetupNextMenu(&OPTIONS_ProfilesDef, false);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue