From e72418696f55ece186d3321627e98fd3fd9e0299 Mon Sep 17 00:00:00 2001
From: Mario <mario@smbclan.net>
Date: Sat, 14 Jan 2017 08:22:36 +1000
Subject: [PATCH] Add a client side option to disable leaderboard, and change
title to "Capture time rankings" instead of simply "Rankings" to avoid
confusion
---
_hud_common.cfg | 1 +
qcsrc/client/hud/panel/scoreboard.qc | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/_hud_common.cfg b/_hud_common.cfg
index 6e88873e96..63c3c8e5bb 100644
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -46,6 +46,7 @@ seta hud_panel_itemstime 2 "enable this panel, 1 = show when spectating,
//seta hud_panel_quickmenu 1 "enable this panel"
//seta hud_panel_scoreboard 1 "enable this panel"
seta hud_panel_scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars"
+seta hud_panel_scoreboard_ctf_leaderboard 1 "show a capture time rankings leaderboard in the scoreboard if allowed by the server"
seta hud_panel_weapons_dynamichud 1 "apply the dynamic hud effects to this panel"
seta hud_panel_ammo_dynamichud 1 "apply the dynamic hud effects to this panel"
diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 6e2400ee69..7ebf337226 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -56,6 +56,7 @@ float autocvar_hud_panel_scoreboard_namesize = 15;
bool autocvar_hud_panel_scoreboard_accuracy = true;
bool autocvar_hud_panel_scoreboard_accuracy_doublerows = false;
bool autocvar_hud_panel_scoreboard_accuracy_nocolors = false;
+bool autocvar_hud_panel_scoreboard_ctf_leaderboard = true;
bool autocvar_hud_panel_scoreboard_dynamichud = false;
@@ -1345,7 +1346,7 @@ vector Scoreboard_Rankings_Draw(vector pos, entity pl, vector rgb, vector bg_siz
vector hl_rgb = rgb + '0.5 0.5 0.5';
pos.y += hud_fontsize.y;
- drawstring(pos + eX * panel_bg_padding, _("Rankings"), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+ drawstring(pos + eX * panel_bg_padding, ((gametype == MAPINFO_TYPE_CTF) ? _("Capture time rankings") : _("Rankings")), hud_fontsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
pos.y += 1.25 * hud_fontsize.y;
if(panel.current_panel_bg != "0")
pos.y += panel_bg_border;
@@ -1570,7 +1571,7 @@ void Scoreboard_Draw()
if (show_accuracy && autocvar_hud_panel_scoreboard_accuracy && !warmup_stage)
pos = Scoreboard_AccuracyStats_Draw(pos, panel_bg_color, bg_size);
- if(gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (gametype == MAPINFO_TYPE_CTF && STAT(CTF_SHOWLEADERBOARD))) {
+ if(gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (autocvar_hud_panel_scoreboard_ctf_leaderboard && gametype == MAPINFO_TYPE_CTF && STAT(CTF_SHOWLEADERBOARD))) {
if(race_speedaward) {
drawcolorcodedstring(pos, sprintf(_("Speed award: %d%s ^7(%s^7)"), race_speedaward, race_speedaward_unit, race_speedaward_holder), hud_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
pos.y += 1.25 * hud_fontsize.y;
--
2.39.5