Merge branch 'master' into TimePath/modules

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

diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
index 760f5d438a8a305aae294ab0f3521dbd26fb1157..91dc98fdcb2c32f7efa917bafd3b8912c1574644 100644 (file)
--- a/qcsrc/client/hud/hud.qc
+++ b/qcsrc/client/hud/hud.qc
@@ -7,7 +7,7 @@
 #include "../teamradar.qh"
 #include <common/t_items.qh>
 #include <common/deathtypes/all.qh>
-#include <common/items/all.qc>
+#include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/vehicles/all.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
@@ -496,7 +496,7 @@ void HUD_Main()
 {
        int i;
        // global hud alpha fade (scoreboard-related panels behave differently and override it temporarly)
-       if(menu_enabled == 1)
+       if(hud_configure_menu_open == 1)
                hud_fade_alpha = 1;
        else if(!autocvar__hud_configure)
                hud_fade_alpha = (1 - scoreboard_fade_alpha) * (1 - autocvar__menu_alpha);