Progressbar autocvars...

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 50b8b4cdb98f179fc4a09261cb77408e1ea5461d..74101dfa52392319a676af65f8b4d9d48499ec0e 100644 (file)
--- 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 87f33303842487f95e01bcd6663e65023daef0c8..41df0d281eacf7543f5c92700a95cb5e4b44aa0e 100644 (file)
--- 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