Remove autocvar_hud_panel_weapons_accuracy_yellow (cvar no longer exist)

Un-autocvarize autocvar_hud_panel_vote_alreadyvoted_alpha

Fix bg alpha formula of the vote panel (was multiplied by panel_bg_alpha twice).

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index e517b0cde1bbd3fabc4bd2145d64afde7f77cc79..c634cfb331a7fab9725254586af25a86502b35c2 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -58,7 +58,6 @@ var string autocvar_hud_panel_weapons_bg_border;
 var string autocvar_hud_panel_weapons_bg_padding;
 var float autocvar_hud_panel_weapons_aspect;
 var float autocvar_hud_panel_weapons_accuracy;
-var float autocvar_hud_panel_weapons_accuracy_yellow;
 var float autocvar_hud_panel_weapons_ammo;
 var vector autocvar_hud_panel_weapons_ammo_color;
 var float autocvar_hud_panel_weapons_ammo_alpha;
@@ -180,7 +179,6 @@ var string autocvar_hud_panel_vote_bg_color_team;
 var string autocvar_hud_panel_vote_bg_alpha;
 var string autocvar_hud_panel_vote_bg_border;
 var string autocvar_hud_panel_vote_bg_padding;
-var float autocvar_hud_panel_vote_alreadyvoted_alpha;
 
 var float autocvar_hud_panel_modicons;
 var vector autocvar_hud_panel_modicons_pos;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 86242af6c9d60c13a1608d2c4f1be3de4f148ab0..9740385db1e0665c77f533959a8c3e3511d16a34 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3795,9 +3795,10 @@ void HUD_VoteWindow(void)
        if(!vote_alpha)
                return;
 
-       a = panel_bg_alpha * vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1);
+       a = vote_alpha * bound(cvar("hud_panel_vote_alreadyvoted_alpha"), 1 - vote_highlighted, 1);
        HUD_Panel_DrawBg(a);
-       a = panel_fg_alpha * vote_alpha * bound(autocvar_hud_panel_vote_alreadyvoted_alpha, 1 - vote_highlighted, 1);
+       a = panel_fg_alpha * a;
+
        if(panel_bg_padding)
        {
                pos += '1 1 0' * panel_bg_padding;

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 5e9d59b6ef29e1c0853e81f2d0dddf56ef12148c..87f33303842487f95e01bcd6663e65023daef0c8 100644 (file)
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -80,7 +80,6 @@ var float panel_bg_border;
 var string panel_bg_border_str;
 var float panel_bg_padding;
 var string panel_bg_padding_str;
-var float panel_accuracy_yellow;
 var float panel_accuracy_onlycurrent;
 var float panel_accuracy_flip;
 var float panel_accuracy_iconalign;