edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed esc key that I broke recently

Browse source
This commit is contained in:
Magnus Auvinen 2008-10-21 18:25:28 +00:00
parent daf9a100eb
commit bf09116059
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/game/client/components/menus.cpp
View file

@ -930,23 +930,22 @@ bool MENUS::on_input(INPUT_EVENT e)
{ {
last_input = time_get(); last_input = time_get();
// special handle esc and enter for popup purposes
if(e.flags&INPFLAG_PRESS)
{
if(e.key == KEY_ESC)
{
escape_pressed = true;
set_active(!is_active());
return true;
}
}
if(is_active()) if(is_active())
{ {
// special handle esc and enter for popup purposes // special for popups
if(e.flags&INPFLAG_PRESS) if(e.flags&INPFLAG_PRESS || e.key == KEY_ENTER)
{ enter_pressed = true;
if(e.key == KEY_ESC)
{
escape_pressed = true;
set_active(!is_active());
return true;
}
else if(e.key == KEY_ENTER)
{
enter_pressed = true;
return true;
}
}
if(num_inputevents < MAX_INPUTEVENTS) if(num_inputevents < MAX_INPUTEVENTS)
inputevents[num_inputevents++] = e; inputevents[num_inputevents++] = e;