Updated some builtin parameter lists, added 2 functions to the menu builtins.

[xonotic/darkplaces.git] / keys.c

diff --git a/keys.c b/keys.c
index 1e2801e2edfd72e92a3894c6e2a2e711dc19f206..ff6ed0e6476ae32f175f1e71c712150a2ec2dcee 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -836,18 +836,13 @@ void Key_Event (int key, char ascii, qboolean down)
                }
        }
 
-       // AK What the fuck ?!?
+       // AK New WTF ?!?
        // AK Changed so the code does what the comments tell 
        // 
        // 1. if console is active or not, always send the up events
+       // console only wants key down events
        if (key_consoleactive && consolekeys[key] && down)
-       {
-               // console only wants key down events
-               //if (!down)
-               //      return;
-
                Key_Console (key, ascii);
-       }
        else
        {
                //
@@ -880,6 +875,7 @@ void Key_Event (int key, char ascii, qboolean down)
                if ((key_consoleactive && !consolekeys[key])
                 || (key_dest == key_menu && menubound[key])
                 || key_dest == key_game)
+               if (!key_consoleactive && key_dest != key_menu)
                {
                        kb = keybindings[key];
                        if (kb)
@@ -899,9 +895,6 @@ void Key_Event (int key, char ascii, qboolean down)
                        return;
                }
 
-               if (!down)
-                       return;         // other systems only care about key down events
-
                switch (key_dest)
                {
                case key_message: