From: terencehill <piuntn@gmail.com>
Date: Sun, 12 Dec 2010 22:16:37 +0000 (+0100)
Subject: Move CTRL-TAB case down: between MOUSE1 and ESCAPE isn't that cute, aesthetically... 
X-Git-Tag: xonotic-v0.5.0~364
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8bdeaeabb7a1c4a05f9ef82f0b40042c699c14d3;p=xonotic%2Fxonotic-data.pk3dir.git

Move CTRL-TAB case down: between MOUSE1 and ESCAPE isn't that cute, aesthetically talking ;)
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index ee1597072..b7556a189 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -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)