From dc86c38527d9f4dae9763dffe7dd75ba76504327 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 5 Sep 2010 13:33:59 +0300 Subject: [PATCH] Apply colors differently. We also don't need the brightness cvars now --- data/defaultVoretournament.cfg | 6 ++---- data/qcsrc/client/sbar.qc | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index e7d7d2d9..b3c6db5f 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -1123,12 +1123,10 @@ seta sbar_scoreboard_fadeoutspeed 5 "speed at which scoreboard fades out, higher seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard" seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)" seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value" -seta sbar_stomachboard_status_brightness 0.5 "brightness of the stomach board status" +seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board indicators for self" +seta sbar_stomachboard_color2 "0.5 0 0" "RGB color of the stomach board indicators for predator" seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status" seta sbar_stomachboard_status_fade 0.0125 "color fading speed of the stomach board status" -seta sbar_stomachboard_status_color1 "0 1 0" "RGB color of the stomach board status for self" -seta sbar_stomachboard_status_color2 "1 0 0" "RGB color of the stomach board status for predator" -seta sbar_stomachboard_highlight_brightness 0.5 "brightness of the stomach board highlight" seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight" seta sbar_timer_increment 0 "1 = show elapsed time on the timer" seta sbar_timer_scale 1 "scale multiplier of the timer" diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index 98130939..5b61c3af 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -965,9 +965,9 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl) if(field == ST_NAME) // do this for one field, or we get multiple highlights in the same spot { if(getstati(STAT_STOMACH_EATEN)) - drawfill(pos - '0 0 0', '193 11 0', '1 0 0' * cvar("sbar_stomachboard_highlight_brightness"), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL); + drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL); else - drawfill(pos - '0 0 0', '193 11 0', '0 1 0' * cvar("sbar_stomachboard_highlight_brightness"), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL); + drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL); } if(field == ST_NAME) { @@ -2947,12 +2947,12 @@ void Sbar_Draw (void) if(getstati(STAT_STOMACH_EATEN)) { - drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stov(cvar_string("sbar_stomachboard_status_color2")) * cvar("sbar_stomachboard_status_brightness")), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); + drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } else { - drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stov(cvar_string("sbar_stomachboard_status_color1")) * cvar("sbar_stomachboard_status_brightness")), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); + drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } } -- 2.39.2