vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: client: like GoldSrc, use cancelselect command for escape key. It is handled in client.dll and allows mods to override Esc key behavior

Browse source
This commit is contained in:
Alibek Omarov 2025-01-06 13:45:47 +03:00
parent b7150c3208
commit 0c4f6ae61d
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/in_touch.c
View file

@ -1101,7 +1101,7 @@ void Touch_Init( void )
Touch_AddDefaultButton( "duck", "touch_default/crouch", "+duck", 0.880000, 0.757428, 1.000000, 0.984656, color, 2, 1, 0 ); Touch_AddDefaultButton( "duck", "touch_default/crouch", "+duck", 0.880000, 0.757428, 1.000000, 0.984656, color, 2, 1, 0 );
Touch_AddDefaultButton( "tduck", "touch_default/tduck", ";+duck", 0.560000, 0.833171, 0.620000, 0.946785, color, 2, 1, 0 ); Touch_AddDefaultButton( "tduck", "touch_default/tduck", ";+duck", 0.560000, 0.833171, 0.620000, 0.946785, color, 2, 1, 0 );
Touch_AddDefaultButton( "edit", "touch_default/settings", "touch_enableedit", 0.420000, 0.000000, 0.500000, 0.151486, color, 2, 1, 32 ); Touch_AddDefaultButton( "edit", "touch_default/settings", "touch_enableedit", 0.420000, 0.000000, 0.500000, 0.151486, color, 2, 1, 32 );
Touch_AddDefaultButton( "menu", "touch_default/menu", "escape", 0.000000, 0.833171, 0.080000, 0.984656, color, 2, 1, 0 ); Touch_AddDefaultButton( "menu", "touch_default/menu", "cancelselect", 0.000000, 0.833171, 0.080000, 0.984656, color, 2, 1, 0 );
Touch_AddDefaultButton( "spray", "touch_default/spray", "impulse 201", 0.680000, 0.000000, 0.760000, 0.142222, color, 2, 1, 8 ); Touch_AddDefaultButton( "spray", "touch_default/spray", "impulse 201", 0.680000, 0.000000, 0.760000, 0.142222, color, 2, 1, 8 );
Touch_AddDefaultButton( "voicechat", "touch_default/microphone", "+voicerecord", 0.780000, 0.817778, 0.860000, 0.960000, color, 2, 1, 8 ); Touch_AddDefaultButton( "voicechat", "touch_default/microphone", "+voicerecord", 0.780000, 0.817778, 0.860000, 0.960000, color, 2, 1, 8 );

14
engine/client/keys.c
View file

@ -40,7 +40,7 @@ static const keyname_t keynames[] =
{ {
{"TAB", K_TAB, "" }, {"TAB", K_TAB, "" },
{"ENTER", K_ENTER, "" }, {"ENTER", K_ENTER, "" },
{"ESCAPE", K_ESCAPE, "escape" }, // hardcoded {"ESCAPE", K_ESCAPE, "cancelselect" }, // hardcoded
{"SPACE", K_SPACE, "+jump" }, {"SPACE", K_SPACE, "+jump" },
{"BACKSPACE", K_BACKSPACE, "" }, {"BACKSPACE", K_BACKSPACE, "" },
{"UPARROW", K_UPARROW, "+forward" }, {"UPARROW", K_UPARROW, "+forward" },
@ -106,7 +106,7 @@ static const keyname_t keynames[] =
{"Y_BUTTON", K_Y_BUTTON, "impulse 100"}, // Flashlight {"Y_BUTTON", K_Y_BUTTON, "impulse 100"}, // Flashlight
{"BACK", K_BACK_BUTTON, "pause"}, // Menu {"BACK", K_BACK_BUTTON, "pause"}, // Menu
{"MODE", K_MODE_BUTTON, ""}, {"MODE", K_MODE_BUTTON, ""},
{"START", K_START_BUTTON, "escape"}, {"START", K_START_BUTTON, "cancelselect"},
{"STICK1", K_LSTICK, "+speed"}, {"STICK1", K_LSTICK, "+speed"},
{"STICK2", K_RSTICK, "+duck"}, {"STICK2", K_RSTICK, "+duck"},
{"L1_BUTTON", K_L1_BUTTON, "+duck"}, {"L1_BUTTON", K_L1_BUTTON, "+duck"},
@ -339,6 +339,12 @@ static void Key_Unbind_f( void )
return; return;
} }
if( b == K_ESCAPE )
{
Con_Printf( "Can't unbind ESCAPE key\n" );
return;
}
Key_SetBinding( b, "" ); Key_SetBinding( b, "" );
} }
@ -358,8 +364,8 @@ static void Key_Unbindall_f( void )
} }
// set some defaults // set some defaults
Key_SetBinding( K_ESCAPE, "escape" ); Key_SetBinding( K_ESCAPE, "cancelselect" );
Key_SetBinding( K_START_BUTTON, "escape" ); Key_SetBinding( K_START_BUTTON, "cancelselect" );
} }
/* /*