From: terencehill <piuntn@gmail.com>
Date: Mon, 28 Dec 2020 21:03:59 +0000 (+0100)
Subject: Minigames: ignore left and right click if not used by a mingame or pressed outside... 
X-Git-Tag: xonotic-v0.8.5~597^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00fa107956f80f6b96683a0996308e55f90710fd;p=xonotic%2Fxonotic-data.pk3dir.git

Minigames: ignore left and right click if not used by a mingame or pressed outside the minigame menu panel; it prevents accidental shooting and zooming
---

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index ebb0decec..973ca428a 100644
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -671,12 +671,16 @@ float HUD_Minigame_InputEvent(float bInputType, float nPrimary, float nSecondary
 			return true;
 	}
 
-	if ( nPrimary == K_MOUSE1 && HUD_MinigameMenu_activeitem &&
-		HUD_mouse_over(HUD_PANEL(MINIGAMEMENU)) )
+	if ( nPrimary == K_MOUSE2 )
+	{
+		return true;
+	}
+	if ( nPrimary == K_MOUSE1 )
 	{
 		if (!key_pressed)
 			return true;
-		HUD_MinigameMenu_Click(HUD_MinigameMenu_activeitem);
+		if (HUD_MinigameMenu_activeitem && HUD_mouse_over(HUD_PANEL(MINIGAMEMENU)))
+			HUD_MinigameMenu_Click(HUD_MinigameMenu_activeitem);
 		return true;
 	}
 	if ( nPrimary == K_UPARROW || nPrimary == K_KP_UPARROW )