yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-04-01 07:51:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent a deadlock when trying to open the menu while connecting

Browse source
This commit is contained in:
Yamagi Burmeister 2011-10-13 14:01:40 +00:00
parent 1077a7101c
commit 75e9f6cf85
1 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/client/cl_keyboard.c
View file

@ -932,43 +932,46 @@ Key_Event ( int key, qboolean down, unsigned time )
/* any key during the attract mode will bring up the menu */
if ( cl.attractloop && ( cls.key_dest != key_menu ) &&
!( ( key >= K_F1 ) && ( key <= K_F12 ) ) )
!( ( key >= K_F1 ) && ( key <= K_F12 ) ) )
{
key = K_ESCAPE;
}
/* menu key is hardcoded, so the user can never unbind it */
if ( key == K_ESCAPE )
if (!cls.disable_screen)
{
if ( !down )
if ( key == K_ESCAPE )
{
if ( !down )
{
return;
}
if ( cl.frame.playerstate.stats [ STAT_LAYOUTS ] && ( cls.key_dest == key_game ) )
{
/* put away help computer / inventory */
Cbuf_AddText( "cmd putaway\n" );
return;
}
switch ( cls.key_dest )
{
case key_message:
Key_Message( key );
break;
case key_menu:
M_Keydown( key );
break;
case key_game:
case key_console:
M_Menu_Main_f();
break;
default:
Com_Error( ERR_FATAL, "Bad cls.key_dest" );
}
return;
}
if ( cl.frame.playerstate.stats [ STAT_LAYOUTS ] && ( cls.key_dest == key_game ) )
{
/* put away help computer / inventory */
Cbuf_AddText( "cmd putaway\n" );
return;
}
switch ( cls.key_dest )
{
case key_message:
Key_Message( key );
break;
case key_menu:
M_Keydown( key );
break;
case key_game:
case key_console:
M_Menu_Main_f();
break;
default:
Com_Error( ERR_FATAL, "Bad cls.key_dest" );
}
return;
}
/* track if any key is down for BUTTON_ANY */