From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 4 Jul 2005 08:35:48 +0000 (+0000)
Subject: allow escape to togglemenu when in fullscreen console
X-Git-Tag: xonotic-v0.1.0preview~4700
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=46adaeecfa4e8d64fa6d557d276421de70f75464;p=xonotic%2Fdarkplaces.git

allow escape to togglemenu when in fullscreen console


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5486 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/keys.c b/keys.c
index cfd62813..5b1aad5f 100644
--- 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;