From: terencehill Date: Tue, 7 Jun 2022 22:05:02 +0000 (+0200) Subject: Forbid opening scoreboard team selection when the game is over X-Git-Tag: xonotic-v0.8.6~409^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f71c1348073e9e72395616da14ef77269b1cfd67;p=xonotic%2Fxonotic-data.pk3dir.git Forbid opening scoreboard team selection when the game is over --- diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 1d9268a03..76f97fd0e 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -180,7 +180,7 @@ void Scoreboard_UI_Enable(int mode) { if (mode == 1) { - if (scoreboard_ui_enabled == 2 || !teamplay) + if (scoreboard_ui_enabled == 2 || !teamplay || intermission) return; // release player's pressed keys as they aren't released elsewhere @@ -1553,7 +1553,14 @@ vector Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) bool Scoreboard_WouldDraw() { if (scoreboard_ui_enabled) + { + if (intermission && scoreboard_ui_enabled == 2) + { + HUD_Scoreboard_UI_Disable(); + return false; + } return true; + } else if (MUTATOR_CALLHOOK(DrawScoreboard)) return false; else if (QuickMenu_IsOpened())