RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "engine: client: allow console toggle from menu via keybind"

Browse Source 
This reverts commit 27c71194ba.
This commit is contained in:
Alibek Omarov
2026-01-26 02:12:07 +05:00
parent 27c71194ba
commit 8ee997b1bc
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
engine/client/cl_gameui.c
View File

@@ -37,6 +37,9 @@ void UI_UpdateMenu( float realtime )
{
if( !gameui.hInstance ) return;
// don't draw menu over console
if( cls.key_dest == key_console ) return;
// if some deferred cmds is waiting
if( UI_IsVisible() && COM_CheckString( host.deferred_cmd ))
{

20
engine/client/console.c
View File

@@ -263,8 +263,8 @@ void Con_ToggleConsole_f( void )
SCR_EndLoadingPlaque();
// show console only in game or by special call from menu
if( cls.state != ca_active || cls.key_dest == key_menu )
// show console only in game, from menu, or to close console
if( cls.state != ca_active && cls.key_dest != key_menu && cls.key_dest != key_console )
return;
Con_ClearTyping();
@@ -272,13 +272,23 @@ void Con_ToggleConsole_f( void )
if( cls.key_dest == key_console )
{
if( Cvar_VariableInteger( "sv_background" ) || Cvar_VariableInteger( "cl_background" ))
// closing console
if( cls.state != ca_active || Cvar_VariableInteger( "sv_background" ) || Cvar_VariableInteger( "cl_background" ))
{
// not in game or in background mode - return to menu
// UI_SetActiveMenu(true) reactivates menu without resetting history
UI_SetActiveMenu( true );
else UI_SetActiveMenu( false );
}
else
{
// in game - return to game
UI_SetActiveMenu( false );
}
}
else
{
UI_SetActiveMenu( false );
// opening console - just switch key_dest, don't call UI_SetActiveMenu
// which would reset menu state via on_menu_hide()
Key_SetKeyDest( key_console );
}
}