stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for overriding the ESC key

Browse source
This commit is contained in:
Matthew Marsalko 2017-12-24 23:09:06 -08:00
parent 6886a29e99
commit 72d80a9aa8
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

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

1
src/g_input.h
View file

@ -118,6 +118,7 @@ typedef enum
gc_jump, gc_jump,
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

@ -1077,6 +1077,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 },
}; };
@ -2176,11 +2178,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