]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Move CTRL-TAB case down: between MOUSE1 and ESCAPE isn't that cute, aesthetically...
authorterencehill <piuntn@gmail.com>
Sun, 12 Dec 2010 22:16:37 +0000 (23:16 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 12 Dec 2010 22:19:12 +0000 (23:19 +0100)
qcsrc/client/hud.qc

index ee1597072d6fdfc5401ef3ffce55aca557750013..b7556a18916048d63c09c6e693a2466188fee299 100644 (file)
@@ -1144,7 +1144,15 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
                        return true;
                }
        }
-       else if(nPrimary == K_TAB && hudShiftState & S_CTRL) //TODO: move this case down
+       else if(nPrimary == K_ESCAPE)
+       {
+               if (bInputType == 1)
+                       return true;
+               menu_enabled = 1;
+               menu_enabled_time = time;
+               localcmd("menu_showhudexit\n");
+       }
+       else if(nPrimary == K_TAB && hudShiftState & S_CTRL) // select and highlight another panel
        {
                if (bInputType == 1 || mouseClicked)
                        return true;
@@ -1228,14 +1236,6 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 
                tab_panels[tab_panel] = tab_panel;
        }
-       else if(nPrimary == K_ESCAPE)
-       {
-               if (bInputType == 1)
-                       return true;
-               menu_enabled = 1;
-               menu_enabled_time = time;
-               localcmd("menu_showhudexit\n");
-       }
        else if(nPrimary == K_SPACE && hudShiftState & S_CTRL) // enable/disable highlighted panel or dock
        {
                if (bInputType == 1 || mouseClicked)