Apply colors differently. We also don't need the brightness cvars now

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index e7d7d2d9c9e8b81e636f6f31ace487ddbf6b235f..b3c6db5f1895c610483c2a2c20624d1f676bb507 100644 (file)
--- 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"\r
 seta sbar_scoreboard_highlight_alpha 0.10 "highlight alpha value (depends on sbar_scoreboard_highlight 1)"\r
 seta sbar_scoreboard_highlight_alpha_self 0.25 "self highlight alpha value"\r
-seta sbar_stomachboard_status_brightness 0.5 "brightness of the stomach board status"\r
+seta sbar_stomachboard_color1 "0 0.5 0" "RGB color of the stomach board indicators for self"\r
+seta sbar_stomachboard_color2 "0.5 0 0" "RGB color of the stomach board indicators for predator"\r
 seta sbar_stomachboard_status_alpha 0.75 "alpha of the stomach board status"\r
 seta sbar_stomachboard_status_fade 0.0125 "color fading speed of the stomach board status"\r
-seta sbar_stomachboard_status_color1 "0 1 0" "RGB color of the stomach board status for self"\r
-seta sbar_stomachboard_status_color2 "1 0 0" "RGB color of the stomach board status for predator"\r
-seta sbar_stomachboard_highlight_brightness 0.5 "brightness of the stomach board highlight"\r
 seta sbar_stomachboard_highlight_alpha 0.25 "alpha of the stomach board highlight"\r
 seta sbar_timer_increment 0 "1 = show elapsed time on the timer"\r
 seta sbar_timer_scale 1 "scale multiplier of the timer"\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 981309391464286a92ddfe5eac594cd85e545bdb..5b61c3af09e52451a70fee11f7f430bf4ded459f 100644 (file)
--- 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\r
                {\r
                        if(getstati(STAT_STOMACH_EATEN))\r
-                               drawfill(pos - '0 0 0', '193 11 0', '1 0 0' * cvar("sbar_stomachboard_highlight_brightness"), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL);\r
+                               drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL);\r
                        else\r
-                               drawfill(pos - '0 0 0', '193 11 0', '0 1 0' * cvar("sbar_stomachboard_highlight_brightness"), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL);\r
+                               drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color1")), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL);\r
                }\r
 \r
                if(field == ST_NAME) {\r
@@ -2947,12 +2947,12 @@ void Sbar_Draw (void)
 \r
                        if(getstati(STAT_STOMACH_EATEN))\r
                        {\r
-                               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);\r
+                               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);\r
                                drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        }\r
                        else\r
                        {\r
-                               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);\r
+                               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);\r
                                drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        }\r
                }\r