thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'title-profile-tweaks' into 'master'

Browse source 
Small fixes for profile selection and skipping title screen

See merge request KartKrew/Kart!895
This commit is contained in:
Oni 2023-01-22 02:51:28 +00:00
commit 5664c8addc
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -1513,7 +1513,7 @@ boolean G_Responder(event_t *ev)
if (gameaction == ga_nothing && !demo.quitafterplaying && if (gameaction == ga_nothing && !demo.quitafterplaying &&
((demo.playback && !modeattacking && !demo.title && !multiplayer) || gamestate == GS_TITLESCREEN)) ((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(); M_StartControlPanel();
return true; return true;

2
src/k_menufunc.c
View file

@ -414,8 +414,6 @@ void M_StartControlPanel(void)
optionsmenu.profilen = cv_ttlprofilen.value; optionsmenu.profilen = cv_ttlprofilen.value;
// options don't need initializing here. // 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. // make sure we don't overstep that.
if (optionsmenu.profilen > PR_GetNumProfiles()) if (optionsmenu.profilen > PR_GetNumProfiles())

1
src/menus/options-profiles-1.c
View file

@ -33,6 +33,7 @@ void M_ProfileSelectInit(INT32 choice)
{ {
(void)choice; (void)choice;
optionsmenu.profilemenu = true; optionsmenu.profilemenu = true;
optionsmenu.profilen = cv_currprofile.value;
M_SetupNextMenu(&OPTIONS_ProfilesDef, false); M_SetupNextMenu(&OPTIONS_ProfilesDef, false);
} }