Properly cvar each component. No more adjusting brightness by HUD background and...

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 38f0dc33a0d17391d380946d62ed9c2a99dc2889..ee80769c2257edbc9a2be6b676614289fef78c79 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1123,6 +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_status_alpha 0.75 "alpha of the stomach board status"\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
 seta sbar_vote_alreadyvoted_alpha 0.75 "alpha of the vote dialog after you have voted"\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index a0ed0ab2f9ee83bccdcba87b9609eb2284f92ef3..bbc647e6d83963ff71a695b94f8b03c0d129418a 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', 0.25, DRAWFLAG_NORMAL);\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
                        else\r
-                               drawfill(pos - '0 0 0', '193 11 0', '0 1 0', 0.25, DRAWFLAG_NORMAL);\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
                }\r
 \r
                if(field == ST_NAME) {\r
@@ -2944,23 +2944,15 @@ void Sbar_Draw (void)
 \r
                                drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL);\r
                        }\r
-                       vector stomach_status_color;\r
+\r
                        if(getstati(STAT_STOMACH_EATEN))\r
                        {\r
-                               stomach_status_color_x = bound(0.25, vlen(color), 1); // reflect HUD background brightness, but only up to a certain limit (so the color is still visible with black HUD)\r
-                               stomach_status_color_y = 0;\r
-                               stomach_status_color_z = 0;\r
-\r
-                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stomach_status_color), sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', '1 0 0' * cvar("sbar_stomachboard_status_brightness"), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL);\r
                                drawstring(bottomleft - '-80 168 0', "predator:", '8 8 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        }\r
                        else\r
                        {\r
-                               stomach_status_color_x = 0;\r
-                               stomach_status_color_y = bound(0.25, vlen(color), 1); // reflect HUD background brightness, but only up to a certain limit (so the color is still visible with black HUD)\r
-                               stomach_status_color_z = 0;\r
-\r
-                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stomach_status_color), sbar_alpha_bg, DRAWFLAG_NORMAL);\r
+                               drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', '0 1 0' * cvar("sbar_stomachboard_status_brightness"), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL);\r
                                drawstring(bottomleft - '-80 168 0', "self:", '8 8 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        }\r
                }\r