From: MirceaKitsune Date: Tue, 2 Aug 2011 16:43:29 +0000 (+0300) Subject: Rename cvars X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53fc1c40fc506d9437c56bf49ba2efdd69dea79d;p=voretournament%2Fvoretournament.git Rename cvars --- diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index 0ecc71ba..4fbd384b 100644 --- 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" seta cl_helper_voice default "name of the helper you wish to use from data/sound/helper" seta cl_helper_pause 2 "number of seconds that must pass before the helper system can be triggered again" -seta cl_helper_health_value 25 "the helper will warn you when going below this amount of health" -seta cl_helper_armor_value 25 "the helper will warn you when going below this amount of armor" -seta cl_helper_ammo_fuel 25 "the helper will warn you when going below this amount of ammo" -seta cl_helper_speed_value 1000 "the helper will warn you when going faster than this speed" -seta cl_helper_stomachload_value 0.75 "the helper will warn you when your stomach is dangerously loaded by this amount" +seta cl_helper_item_health 25 "the helper will warn you when going below this amount of health" +seta cl_helper_item_armor 25 "the helper will warn you when going below this amount of armor" +seta cl_helper_item_ammo_fuel 25 "the helper will warn you when going below this amount of ammo" +seta cl_helper_item_speed 1000 "the helper will warn you when going faster than this speed" +seta cl_helper_item_stomachload 0.75 "the helper will warn you when your stomach is dangerously loaded by this amount" seta cl_eventchase_death 1 "camera goes into 3rd person mode when the player is dead" seta cl_eventchase_distance 140 "final camera distance" diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 01f15297..40c8dbeb 100644 --- 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) { // health helper - if(getstati(STAT_HEALTH) <= cvar("cl_helper_health_value")) + if(getstati(STAT_HEALTH) <= cvar("cl_helper_item_health")) { if(!helper_health) { @@ -325,7 +325,7 @@ void CSQC_UpdateView(float w, float h) helper_health = FALSE; // armor helper - if(getstati(STAT_ARMOR) <= cvar("cl_helper_armor_value")) + if(getstati(STAT_ARMOR) <= cvar("cl_helper_item_armor")) { if(!helper_armor) { @@ -338,7 +338,7 @@ void CSQC_UpdateView(float w, float h) helper_armor = FALSE; // ammo helper - if(getstati(STAT_FUEL) <= cvar("cl_helper_ammo_fuel")) + if(getstati(STAT_FUEL) <= cvar("cl_helper_item_ammo_fuel")) { if(!helper_ammo) { @@ -351,7 +351,7 @@ void CSQC_UpdateView(float w, float h) helper_ammo = FALSE; // speed helper - if(vlen(pmove_vel) >= cvar("cl_helper_speed_value")) + if(vlen(pmove_vel) >= cvar("cl_helper_item_speed")) { if(!helper_speed) { @@ -364,7 +364,7 @@ void CSQC_UpdateView(float w, float h) helper_speed = FALSE; // stomach load helper - if(getstati(STAT_VORE_LOAD) / getstati(STAT_VORE_MAXLOAD) >= cvar("cl_helper_stomachload_value")) + if(getstati(STAT_VORE_LOAD) / getstati(STAT_VORE_MAXLOAD) >= cvar("cl_helper_item_stomachload")) { if(!helper_stomachload) {