thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable profile setup outside of GS_MENU

Browse source
This commit is contained in:
SinnamonLat 2022-02-19 21:45:42 +01:00
parent 33639d7a4c
commit 8920ec8e6a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_menu.h
View file

@ -211,7 +211,7 @@ extern menu_t OPTIONS_MainDef;
// We'll need this since we're gonna have to dynamically enable and disable options depending on which state we're in. // We'll need this since we're gonna have to dynamically enable and disable options depending on which state we're in.
typedef enum typedef enum
{ {
mopt_controls = 0, mopt_profiles = 0,
mopt_video, mopt_video,
mopt_sound, mopt_sound,
mopt_hud, mopt_hud,

9
src/k_menufunc.c
View file

@ -3414,6 +3414,7 @@ void M_InitOptions(INT32 choice)
{ {
(void)choice; (void)choice;
OPTIONS_MainDef.menuitems[mopt_profiles].status = IT_STRING | IT_SUBMENU;
OPTIONS_MainDef.menuitems[mopt_gameplay].status = IT_STRING | IT_SUBMENU; OPTIONS_MainDef.menuitems[mopt_gameplay].status = IT_STRING | IT_SUBMENU;
OPTIONS_MainDef.menuitems[mopt_server].status = IT_STRING | IT_SUBMENU; OPTIONS_MainDef.menuitems[mopt_server].status = IT_STRING | IT_SUBMENU;
@ -3424,6 +3425,10 @@ void M_InitOptions(INT32 choice)
OPTIONS_MainDef.menuitems[mopt_server].status = IT_STRING | IT_TRANSTEXT; OPTIONS_MainDef.menuitems[mopt_server].status = IT_STRING | IT_TRANSTEXT;
} }
// disable profiles outside of gs_menu altogether.
if (gamestate != GS_MENU)
OPTIONS_MainDef.menuitems[mopt_profiles].status = IT_STRING | IT_TRANSTEXT;
optionsmenu.ticker = 0; optionsmenu.ticker = 0;
optionsmenu.offset = 0; optionsmenu.offset = 0;
@ -3961,10 +3966,10 @@ void M_MapProfileControl(event_t *ev)
// Only consider keydown and joystick events to make sure we ignore ev_mouse and other events // Only consider keydown and joystick events to make sure we ignore ev_mouse and other events
if (ev->type != ev_keydown && ev->type != ev_joystick) if (ev->type != ev_keydown && ev->type != ev_joystick)
return; return;
// Set menu delay regardless of what we're doing to avoid stupid stuff. // Set menu delay regardless of what we're doing to avoid stupid stuff.
M_SetMenuDelay(0); M_SetMenuDelay(0);
// Check if this control is already assigned, it'd look silly to assign the same key twice on the same thing. // Check if this control is already assigned, it'd look silly to assign the same key twice on the same thing.
if (n == 0 && optionsmenu.profile->controls[controln][1] == c) if (n == 0 && optionsmenu.profile->controls[controln][1] == c)
{ {