From cde2650f0c177f5e22b735415656335f64587ae2 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Mon, 11 Apr 2011 22:38:09 +0300 Subject: [PATCH] Rename some cvars --- balance25.cfg | 4 ++-- balanceLeeStricklin.cfg | 4 ++-- balanceSamual.cfg | 4 ++-- balanceXonotic.cfg | 4 ++-- balancetZork.cfg | 4 ++-- qcsrc/server/autocvars.qh | 4 ++-- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/w_hagar.qc | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index d40ae54a6..72f79008a 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -539,8 +539,8 @@ set g_balance_hagar_primary_refire 0.15 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 -set g_balance_hagar_secondary_load_maxload 4 -set g_balance_hagar_secondary_load_canhold 0 +set g_balance_hagar_secondary_load_max 4 +set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 37 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 815e0df2f..e43ce3f1f 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -539,8 +539,8 @@ set g_balance_hagar_primary_refire 0.15 set g_balance_hagar_primary_ammo 2 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 -set g_balance_hagar_secondary_load_maxload 4 -set g_balance_hagar_secondary_load_canhold 0 +set g_balance_hagar_secondary_load_max 4 +set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 43 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 100 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index cfd4c9df7..6652472cb 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -539,8 +539,8 @@ set g_balance_hagar_primary_refire 0.15 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 -set g_balance_hagar_secondary_load_maxload 4 -set g_balance_hagar_secondary_load_canhold 0 +set g_balance_hagar_secondary_load_max 4 +set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 35 set g_balance_hagar_secondary_edgedamage 17.5 set g_balance_hagar_secondary_force 100 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 62d70dc90..a6b4c710f 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -539,8 +539,8 @@ set g_balance_hagar_primary_refire 0.12 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 1 -set g_balance_hagar_secondary_load_maxload 4 -set g_balance_hagar_secondary_load_canhold 0 +set g_balance_hagar_secondary_load_max 4 +set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 22 set g_balance_hagar_secondary_edgedamage 6 set g_balance_hagar_secondary_force 70 diff --git a/balancetZork.cfg b/balancetZork.cfg index 38e2efd48..c6e29ee1b 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -538,8 +538,8 @@ set g_balance_hagar_primary_refire 0.2 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 set g_balance_hagar_secondary_load 0 -set g_balance_hagar_secondary_load_maxload 4 -set g_balance_hagar_secondary_load_canhold 0 +set g_balance_hagar_secondary_load_max 4 +set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_damage 30 set g_balance_hagar_secondary_edgedamage 15 set g_balance_hagar_secondary_force 50 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index c6dbbed9c..a76417da8 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -317,8 +317,8 @@ float autocvar_g_balance_hagar_primary_refire; float autocvar_g_balance_hagar_primary_speed; float autocvar_g_balance_hagar_secondary; float autocvar_g_balance_hagar_secondary_load; -float autocvar_g_balance_hagar_secondary_load_maxload; -float autocvar_g_balance_hagar_secondary_load_canhold; +float autocvar_g_balance_hagar_secondary_load_max; +float autocvar_g_balance_hagar_secondary_load_hold; float autocvar_g_balance_hagar_secondary_ammo; float autocvar_g_balance_hagar_secondary_damage; float autocvar_g_balance_hagar_secondary_edgedamage; diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 5fe137f19..93dfc1c5f 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -1121,7 +1121,7 @@ float ClientInit_SendEntity(entity to, float sf) WriteByte(MSG_ENTITY, autocvar_g_balance_sniperrifle_secondary); // client has to know if it should zoom or not WriteByte(MSG_ENTITY, serverflags); // client has to know if it should zoom or not WriteByte(MSG_ENTITY, autocvar_g_balance_minelayer_limit); // minelayer max mines - WriteByte(MSG_ENTITY, autocvar_g_balance_hagar_secondary_load_maxload); // hagar max loadable rockets + WriteByte(MSG_ENTITY, autocvar_g_balance_hagar_secondary_load_max); // hagar max loadable rockets WriteCoord(MSG_ENTITY, autocvar_g_trueaim_minrange); return TRUE; } diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index a770abba3..19335fbc7 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -130,7 +130,7 @@ void W_Hagar_Attack2_Load (void) local vector s; vector forward, right, up; - loaded = self.hagar_load >= autocvar_g_balance_hagar_secondary_load_maxload; + loaded = self.hagar_load >= autocvar_g_balance_hagar_secondary_load_max; // check if we have enough ammo for another rocket used_ammo = autocvar_g_balance_hagar_secondary_ammo; @@ -150,7 +150,7 @@ void W_Hagar_Attack2_Load (void) self.hagarload_refire = time + autocvar_g_balance_hagar_secondary_refire; } } - else if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_canhold))) + else if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_hold))) { // time to release the rockets we've loaded -- 2.39.2