]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Minigames: ignore left and right click if not used by a mingame or pressed outside...
authorterencehill <piuntn@gmail.com>
Mon, 28 Dec 2020 21:03:59 +0000 (22:03 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 28 Dec 2020 21:03:59 +0000 (22:03 +0100)
qcsrc/common/minigames/cl_minigames_hud.qc

index ebb0decec0a34dc3dcb00eaa8fa7436acacd3a6c..973ca428ab59b487c878a0f899220d4c028ba4d3 100644 (file)
@@ -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 )