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

Properly only accept menu controls when its active

Browse source
This commit is contained in:
Sally Coolatta 2021-12-28 05:19:04 -05:00
parent 479292543a
commit c49a5dd0cf
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_input.h
View file

@ -38,7 +38,7 @@ typedef enum
KEY_HAT1 = KEY_JOY1 + JOYBUTTONS, KEY_HAT1 = KEY_JOY1 + JOYBUTTONS,
KEY_AXIS1 = KEY_HAT1 + JOYHATS*4, KEY_AXIS1 = KEY_HAT1 + JOYHATS*4,
KEY_MOUSE1 = KEY_AXIS1 + JOYAXISSET*4, KEY_MOUSE1 = KEY_AXIS1 + JOYAXISSET*2*2, // 4 sets of 2 axes, each with positive & negative
KEY_MOUSEMOVE = KEY_MOUSE1 + MOUSEBUTTONS, KEY_MOUSEMOVE = KEY_MOUSE1 + MOUSEBUTTONS,
KEY_MOUSEWHEELUP = KEY_MOUSEMOVE + 4, KEY_MOUSEWHEELUP = KEY_MOUSEMOVE + 4,
KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1, KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1,

19
src/k_menufunc.c
View file

@ -862,7 +862,7 @@ boolean M_Responder(event_t *ev)
} }
#endif #endif
if (G_PlayerInputDown(0, gc_start, true) == true) if (CON_Ready() == false && G_PlayerInputDown(0, gc_start, true) == true)
{ {
if (chat_on) if (chat_on)
{ {
@ -1516,17 +1516,20 @@ void M_Ticker(void)
} }
} }
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) if (menuactive == true)
{ {
if (menucmd[i].delay > 0) for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{ {
menucmd[i].delay--; if (menucmd[i].delay > 0)
{
menucmd[i].delay--;
}
} }
}
if (noFurtherInput == false) if (noFurtherInput == false)
{ {
M_HandleMenuInput(); M_HandleMenuInput();
}
} }
if (currentMenu->tickroutine) if (currentMenu->tickroutine)