From: terencehill <piuntn@gmail.com>
Date: Tue, 23 Apr 2019 13:14:52 +0000 (+0200)
Subject: When dead forcedly show scoreboard only if not actively playing a minigame
X-Git-Tag: xonotic-v0.8.5~1534
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d9a77014cc527769af411f444656686282586fd;p=xonotic%2Fxonotic-data.pk3dir.git

When dead forcedly show scoreboard only if not actively playing a minigame
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 46ea827ae..93162f6bc 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1130,8 +1130,11 @@ bool Scoreboard_WouldDraw()
 		return true;
 	else if (intermission == 2)
 		return false;
-	else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && !ISGAMETYPE(CTS) && !active_minigame)
+	else if (spectatee_status != -1 && STAT(HEALTH) <= 0 && autocvar_cl_deathscoreboard && !ISGAMETYPE(CTS)
+		&& (!HUD_MinigameMenu_IsOpened() || !active_minigame))
+	{
 		return true;
+	}
 	else if (scoreboard_showscores_force)
 		return true;
 	return false;