From: terencehill <piuntn@gmail.com>
Date: Sat, 30 Oct 2010 22:17:44 +0000 (+0200)
Subject: Progressbar autocvars...
X-Git-Tag: xonotic-v0.1.0preview~134^2~6^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a1485c3c79e2f8281ce3687867fdff43f907875;p=xonotic%2Fxonotic-data.pk3dir.git

Progressbar autocvars...
---

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 50b8b4cdb..74101dfa5 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -32,12 +32,6 @@ var float autocvar_hud_dock_color_team;
 var float autocvar_hud_dock_alpha;
 
 var float autocvar_hud_progressbar_alpha;
-var vector autocvar_hud_progressbar_strength_color;
-var vector autocvar_hud_progressbar_shield_color;
-var vector autocvar_hud_progressbar_health_color;
-var vector autocvar_hud_progressbar_armor_color;
-var vector autocvar_hud_progressbar_fuel_color;
-var vector autocvar_hud_progressbar_nexball_color;
 
 var string autocvar_hud_panel_bg;
 var vector autocvar_hud_panel_bg_color;
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 87f333038..41df0d281 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -98,12 +98,12 @@ var string picpath;
 
 #define HUD_Panel_GetProgressBarColor(item) \
 switch(item) {\
-	case "strength": progressbar_color = autocvar_hud_progressbar_strength_color; break;\
-	case "shield": progressbar_color = autocvar_hud_progressbar_shield_color; break;\
-	case "health": progressbar_color = autocvar_hud_progressbar_health_color; break;\
-	case "armor": progressbar_color = autocvar_hud_progressbar_armor_color; break;\
-	case "fuel": progressbar_color = autocvar_hud_progressbar_fuel_color; break;\
-	case "nexball": progressbar_color = autocvar_hud_progressbar_nexball_color; break;\
+	case "strength": progressbar_color = stov(cvar_string("hud_progressbar_strength_color")); break;\
+	case "shield": progressbar_color = stov(cvar_string("hud_progressbar_shield_color")); break;\
+	case "health": progressbar_color = stov(cvar_string("hud_progressbar_health_color")); break;\
+	case "armor": progressbar_color = stov(cvar_string("hud_progressbar_armor_color")); break;\
+	case "fuel": progressbar_color = stov(cvar_string("hud_progressbar_fuel_color")); break;\
+	case "nexball": progressbar_color = stov(cvar_string("hud_progressbar_nexball_color")); break;\
 }
 
 // Get value for panel_bg: if "" fetch default, else use panel_bg_str