From: terencehill <piuntn@gmail.com>
Date: Thu, 28 Oct 2010 22:20:23 +0000 (+0200)
Subject: Remove autocvar_hud_panel_weapons_accuracy_yellow (cvar no longer exist)
X-Git-Tag: xonotic-v0.1.0preview~134^2~6^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b87017a82e358ade5795a531bbda9f9e5562a9b0;p=xonotic%2Fxonotic-data.pk3dir.git

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 e517b0cde..c634cfb33 100644
--- 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 86242af6c..9740385db 100644
--- 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 5e9d59b6e..87f333038 100644
--- 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;