]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
When dead forcedly show scoreboard only if not actively playing a minigame
authorterencehill <piuntn@gmail.com>
Tue, 23 Apr 2019 13:14:52 +0000 (15:14 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 23 Apr 2019 13:14:52 +0000 (15:14 +0200)
qcsrc/client/hud/panel/scoreboard.qc

index 46ea827aee933fbc2e83e502a51509a60f05d644..93162f6bcca059030ae1efae4b57cb98e56e7e79 100644 (file)
@@ -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;