Merge remote-tracking branch 'origin/Mario/quickmenu_merge' into terencehill/quickmen...

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

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 8a7d3fd49fd8976d83dc2651cfc0ad5bce69e749..0d2cd934ead26dcaa799f65ff1310267059d0da8 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -952,6 +952,8 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 float HUD_WouldDrawScoreboard() {
        if (autocvar__hud_configure)
                return 0;
+       else if (HUD_QuickMenu_IsOpened())
+               return 0;
        else if (scoreboard_showscores)
                return 1;
        else if (intermission == 1)