From: terencehill <piuntn@gmail.com>
Date: Thu, 9 Sep 2021 22:07:14 +0000 (+0200)
Subject: Make QuickMenu_InputEvent code even more like HUD_Radar_InputEvent
X-Git-Tag: xonotic-v0.8.5~343^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f5595d958983c061bd41ff2920ac4baacf00b39e;p=xonotic%2Fxonotic-data.pk3dir.git

Make QuickMenu_InputEvent code even more like HUD_Radar_InputEvent
---

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index d2e5c7224..3c3a5ba86 100644
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -449,17 +449,6 @@ bool QuickMenu_InputEvent(int bInputType, float nPrimary, float nSecondary)
 	// at this point bInputType can only be 0 or 1 (key pressed or released)
 	bool key_pressed = (bInputType == 0);
 
-	// allow console bind to work
-	string con_keys = findkeysforcommand("toggleconsole", 0);
-	int keys = tokenize(con_keys); // findkeysforcommand returns data for this
-	bool hit_con_bind = false;
-	int i;
-	for (i = 0; i < keys; ++i)
-	{
-		if(nPrimary == stof(argv(i)))
-			hit_con_bind = true;
-	}
-
 	if(key_pressed)
 	{
 		if(nPrimary == K_ALT) hudShiftState |= S_ALT;
@@ -473,15 +462,7 @@ bool QuickMenu_InputEvent(int bInputType, float nPrimary, float nSecondary)
 		if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
 	}
 
-	if(nPrimary == K_ESCAPE && key_pressed)
-	{
-		QuickMenu_Close();
-	}
-	else if(nPrimary >= '0' && nPrimary <= '9' && key_pressed)
-	{
-		QuickMenu_Page_ActiveEntry(stof(chr2str(nPrimary)));
-	}
-	else if(nPrimary == K_MOUSE1)
+	if(nPrimary == K_MOUSE1)
 	{
 		if(key_pressed)
 			mouseClicked |= S_MOUSE1;
@@ -495,10 +476,25 @@ bool QuickMenu_InputEvent(int bInputType, float nPrimary, float nSecondary)
 		else
 			mouseClicked -= (mouseClicked & S_MOUSE2);
 	}
+	else if(nPrimary == K_ESCAPE && key_pressed)
+	{
+		QuickMenu_Close();
+	}
+	else if(nPrimary >= '0' && nPrimary <= '9' && key_pressed)
+	{
+		QuickMenu_Page_ActiveEntry(stof(chr2str(nPrimary)));
+	}
 	else
 	{
-		if(hit_con_bind)
-			return false;
+		// allow console bind to work
+		string con_keys = findkeysforcommand("toggleconsole", 0);
+		int keys = tokenize(con_keys); // findkeysforcommand returns data for this
+		int i;
+		for (i = 0; i < keys; ++i)
+		{
+			if(nPrimary == stof(argv(i)))
+				return false; // hit console bind
+		}
 		if (key_pressed)
 			QuickMenu_Close();
 		return false;