]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
return from the keyboard function if the mouse is clicked, easy way to prevent bugs...
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 29 Jun 2010 08:23:19 +0000 (11:23 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 29 Jun 2010 08:23:19 +0000 (11:23 +0300)
qcsrc/client/hud.qc

index 6d56b63149542ecd2365fe09aeba5281df875ca9..75fc7b60f202b7c9bf4f2ea4c4a52e2369138314 100644 (file)
@@ -1116,10 +1116,17 @@ void HUD_Panel_SetPosSize(float id, vector mySize)
        cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
 }
 
+float mouseClicked;
+float prevMouseClicked; // previous state
+float prevMouseClickedTime; // time during previous mouse click, to check for doubleclicks
+vector prevMouseClickedPos; // pos during previous mouse click, to check for doubleclicks
+
+float menu_enabled;
+float menu_enabled_time;
 float pressed_key_time;
 void HUD_Panel_Arrow_Action(float nPrimary)
 {
-       if (highlightedPanel_prev == -1)
+       if (highlightedPanel_prev == -1 || mouseClicked)
                return;
 
        hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions"));
@@ -1191,13 +1198,6 @@ void HUD_Panel_Arrow_Action(float nPrimary)
        }
 }
 
-float mouseClicked;
-float prevMouseClicked; // previous state
-float prevMouseClickedTime; // time during previous mouse click, to check for doubleclicks
-vector prevMouseClickedPos; // pos during previous mouse click, to check for doubleclicks
-
-float menu_enabled;
-float menu_enabled_time;
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
        if(!hud_configure)