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 commit 'c92926bfb6e080e39e658086fbc6f44b605348d3' into sonicitems

Browse source
This commit is contained in:
wolfy852 2018-09-09 17:57:23 -05:00
commit 56e615d595
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_input.c
View file

@ -1208,6 +1208,7 @@ static const char *gamecontrolname[num_gamecontrols] =
"scores", "scores",
"console", "console",
"pause", "pause",
"systemmenu",
"custom1", "custom1",
"custom2", "custom2",
"custom3", "custom3",

1
src/g_input.h
View file

@ -114,6 +114,7 @@ typedef enum
gc_scores, gc_scores,
gc_console, gc_console,
gc_pause, gc_pause,
gc_systemmenu,
gc_custom1, // Lua scriptable gc_custom1, // Lua scriptable
gc_custom2, // Lua scriptable gc_custom2, // Lua scriptable
gc_custom3, // Lua scriptable gc_custom3, // Lua scriptable

5
src/m_menu.c
View file

@ -1146,6 +1146,8 @@ static menuitem_t OP_MiscControlsMenu[] =
{IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 }, {IT_CALL | IT_STRING2, NULL, "Custom Action 2", M_ChangeControl, gc_custom2 },
{IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 }, {IT_CALL | IT_STRING2, NULL, "Custom Action 3", M_ChangeControl, gc_custom3 },
{IT_CALL | IT_STRING2, NULL, "System Menu (ESC)",M_ChangeControl, gc_systemmenu },
{IT_CALL | IT_STRING2, NULL, "Pause", M_ChangeControl, gc_pause }, {IT_CALL | IT_STRING2, NULL, "Pause", M_ChangeControl, gc_pause },
{IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, gc_console }, {IT_CALL | IT_STRING2, NULL, "Console", M_ChangeControl, gc_console },
@ -2462,11 +2464,14 @@ boolean M_Responder(event_t *ev)
if (ch == -1) if (ch == -1)
return false; return false;
else if (ch == gamecontrol[gc_systemmenu][0]) // allow remappable ESC key
ch = KEY_ESCAPE;
// F-Keys // F-Keys
if (!menuactive) if (!menuactive)
{ {
noFurtherInput = true; noFurtherInput = true;
switch (ch) switch (ch)
{ {
case KEY_F1: // Help key case KEY_F1: // Help key