Merge branch 'master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 71bbe7f4cd3f215e12c93ecdc28a4dca55eb66bc..540a0269f34ef869c0ec8242baa49421cdee86e7 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1327,10 +1327,10 @@ void HUD_Panel_Mouse()
        print("Menu alpha: ", cvar_string("_menu_alpha"), "\n");
        */
 
-       // this makes instantly hide the editor cursor, it's needed in case we
-       // open the HUDExit dialog as hud_fade_alpha doesn't decrease to 0
+       // instantly hide the editor cursor if we open the HUDExit dialog
+       // as hud_fade_alpha doesn't decrease to 0 in this case
        // TODO: find a way to fade the cursor out even in this case
-       if(menu_enabled)
+       if(menu_enabled == 1 || (menu_enabled == 2 && !hud_fade_alpha))
                return;
 
        if(mouseClicked == 0 && menu_enabled != 2 && highlightedPanel >= 0) { // don't reset these variables in menu_enabled mode 2!
@@ -4920,6 +4920,9 @@ void HUD_Main (void)
 
        hud_fontsize = HUD_GetFontsize("hud_fontsize");
 
+       if(!autocvar__hud_configure && !hud_fade_alpha)
+               return;
+
        // Drawing stuff
 
        // HUD configure visible grid