From 3d39cc939dd2ecaefb2e12d944b6deca437222e3 Mon Sep 17 00:00:00 2001 From: samual Date: Sat, 10 Oct 2009 21:04:13 +0000 Subject: [PATCH] Fix scoreboard for those who have an earlier version of Nexuiz.... (The cvars didn't exist before, so they were blank to older clients) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8089 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/sbar.qc | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index 55de511fb..e22e62789 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -1136,13 +1136,34 @@ void Sbar_DrawScoreboard() if not(sbar_scoreboard_fade_alpha) return; + sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg") * sbar_scoreboard_fade_alpha; - sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg") * sbar_scoreboard_fade_alpha; + if(cvar("sbar_scoreboard_alpha_fg")) + sbar_scoreboard_alpha_fg = cvar("sbar_scoreboard_alpha_fg") * sbar_scoreboard_fade_alpha; + else + sbar_scoreboard_alpha_fg = 1; + sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight"); - sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha") * sbar_scoreboard_fade_alpha; - sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self") * sbar_scoreboard_fade_alpha; - sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name") * sbar_scoreboard_fade_alpha; - sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self") * sbar_scoreboard_fade_alpha; + + if(cvar("sbar_scoreboard_highlight_alpha")) + sbar_scoreboard_highlight_alpha = cvar("sbar_scoreboard_highlight_alpha") * sbar_scoreboard_fade_alpha; + else + sbar_scoreboard_highlight_alpha = 0.10; + + if(cvar("sbar_scoreboard_highlight_alpha_self")) + sbar_scoreboard_highlight_alpha_self = cvar("sbar_scoreboard_highlight_alpha_self") * sbar_scoreboard_fade_alpha; + else + sbar_scoreboard_highlight_alpha_self = 0.25; + + if(cvar("sbar_scoreboard_alpha_name")) + sbar_scoreboard_alpha_name = cvar("sbar_scoreboard_alpha_name") * sbar_scoreboard_fade_alpha; + else + sbar_scoreboard_alpha_name = 0.9; + + if(cvar("sbar_scoreboard_alpha_name_self")) + sbar_scoreboard_alpha_name_self = cvar("sbar_scoreboard_alpha_name_self") * sbar_scoreboard_fade_alpha; + else + sbar_scoreboard_alpha_name_self = 1; vector rgb, pos, tmp; entity pl, tm; -- 2.39.2