Rename cvars

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 0ecc71ba76c0ac474e09b9c234255594009830c7..4fbd384bd0b2c7475251a939e0dbc0bb056f3325 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -677,11 +677,11 @@ seta cl_announcer default "name of the announcer you wish to use from data/sound
 seta cl_helper 1 "enable helper system"\r
 seta cl_helper_voice default "name of the helper you wish to use from data/sound/helper"\r
 seta cl_helper_pause 2 "number of seconds that must pass before the helper system can be triggered again"\r
-seta cl_helper_health_value 25 "the helper will warn you when going below this amount of health"\r
-seta cl_helper_armor_value 25 "the helper will warn you when going below this amount of armor"\r
-seta cl_helper_ammo_fuel 25 "the helper will warn you when going below this amount of ammo"\r
-seta cl_helper_speed_value 1000 "the helper will warn you when going faster than this speed"\r
-seta cl_helper_stomachload_value 0.75 "the helper will warn you when your stomach is dangerously loaded by this amount"\r
+seta cl_helper_item_health 25 "the helper will warn you when going below this amount of health"\r
+seta cl_helper_item_armor 25 "the helper will warn you when going below this amount of armor"\r
+seta cl_helper_item_ammo_fuel 25 "the helper will warn you when going below this amount of ammo"\r
+seta cl_helper_item_speed 1000 "the helper will warn you when going faster than this speed"\r
+seta cl_helper_item_stomachload 0.75 "the helper will warn you when your stomach is dangerously loaded by this amount"\r
 \r
 seta cl_eventchase_death 1 "camera goes into 3rd person mode when the player is dead"\r
 seta cl_eventchase_distance 140 "final camera distance"\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 01f152979182b259eec23e0bc996b459077b0c53..40c8dbeb9a60d937284b847053c85fad2378af9b 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -311,7 +311,7 @@ void CSQC_UpdateView(float w, float h)
                else if(helper_pause <= time)\r
                {\r
                        // health helper\r
-                       if(getstati(STAT_HEALTH) <= cvar("cl_helper_health_value"))\r
+                       if(getstati(STAT_HEALTH) <= cvar("cl_helper_item_health"))\r
                        {\r
                                if(!helper_health)\r
                                {\r
@@ -325,7 +325,7 @@ void CSQC_UpdateView(float w, float h)
                                helper_health = FALSE;\r
 \r
                        // armor helper\r
-                       if(getstati(STAT_ARMOR) <= cvar("cl_helper_armor_value"))\r
+                       if(getstati(STAT_ARMOR) <= cvar("cl_helper_item_armor"))\r
                        {\r
                                if(!helper_armor)\r
                                {\r
@@ -338,7 +338,7 @@ void CSQC_UpdateView(float w, float h)
                                helper_armor = FALSE;\r
 \r
                        // ammo helper\r
-                       if(getstati(STAT_FUEL) <= cvar("cl_helper_ammo_fuel"))\r
+                       if(getstati(STAT_FUEL) <= cvar("cl_helper_item_ammo_fuel"))\r
                        {\r
                                if(!helper_ammo)\r
                                {\r
@@ -351,7 +351,7 @@ void CSQC_UpdateView(float w, float h)
                                helper_ammo = FALSE;\r
 \r
                        // speed helper\r
-                       if(vlen(pmove_vel) >= cvar("cl_helper_speed_value"))\r
+                       if(vlen(pmove_vel) >= cvar("cl_helper_item_speed"))\r
                        {\r
                                if(!helper_speed)\r
                                {\r
@@ -364,7 +364,7 @@ void CSQC_UpdateView(float w, float h)
                                helper_speed = FALSE;\r
 \r
                        // stomach load helper\r
-                       if(getstati(STAT_VORE_LOAD) / getstati(STAT_VORE_MAXLOAD) >= cvar("cl_helper_stomachload_value"))\r
+                       if(getstati(STAT_VORE_LOAD) / getstati(STAT_VORE_MAXLOAD) >= cvar("cl_helper_item_stomachload"))\r
                        {\r
                                if(!helper_stomachload)\r
                                {\r