allow escape to togglemenu when in fullscreen console
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 4 Jul 2005 08:35:48 +0000 (08:35 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 4 Jul 2005 08:35:48 +0000 (08:35 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5486 d7cf8633-e32d-0410-b094-e92efae38249

keys.c

diff --git a/keys.c b/keys.c
index cfd6281..5b1aad5 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -839,7 +839,7 @@ Key_Event (int key, char ascii, qboolean down)
                // key_menu - go to parent menu (or key_game)
                // key_game - open menu
                // in all modes shift-escape toggles console
-               if (key_consoleactive || keydown[K_SHIFT])
+               if ((key_consoleactive & KEY_CONSOLEACTIVE_USER) || keydown[K_SHIFT])
                {
                        Con_ToggleConsole_f ();
                        return;