fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-04-22 03:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

adjust confirmation dialog hack

Browse source
This commit is contained in:
Eric Wasylishen 2016-02-08 01:54:49 -07:00
parent 3faf16b104
commit ee3d330b32
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
quakespasm/Quake/gl_screen.c
View file

@ -924,7 +924,7 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
} while (lastchar != 'y' && lastchar != 'Y' &&
lastchar != 'n' && lastchar != 'N' &&
lastkey != K_ESCAPE &&
lastkey != K_X360_B && lastkey != K_X360_A &&
lastkey != K_ENTER && //ericw -- K_ENTER used by x360 controller
time2 <= time1);
Key_EndInputGrab ();
@ -935,7 +935,7 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
return false;
//johnfitz
return (lastchar == 'y' || lastchar == 'Y' || lastkey == K_X360_A);
return (lastchar == 'y' || lastchar == 'Y' || lastkey == K_ENTER);
}

3
quakespasm/Quake/keys.c
View file

@ -996,8 +996,7 @@ void Key_Event (int key, qboolean down)
{
int emukey = IN_EmulatedKeyForControllerKey(key);
if (key_dest == key_menu
&& !key_inputgrab.active)
if (key_dest == key_game)
{
key = emukey;
}