Rename some cvars

diff --git a/balance25.cfg b/balance25.cfg
index d40ae54a665392a759faf64c05cb7761a0a57d15..72f79008a477331dff0d352c7b2259bb91b3ecc1 100644 (file)
--- 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 815e0df2f4f434f2e9f1428652b3809099dd0c9d..e43ce3f1f2be958438b4944b18bf062db2257224 100644 (file)
--- 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 cfd4c9df7317c4c7a603d0ef22f2b155fa4dcb93..6652472cbc1214232bb3527b2d182687af77fd58 100644 (file)
--- 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 62d70dc90a5d45607593b0285563af084eeca1e6..a6b4c710f98625cf17078ed790f9e7ddd4d84ff1 100644 (file)
--- 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 38e2efd48d52e385833b891184c699c6932d94fb..c6e29ee1b7d485176d2251bd932dbe71c16d155c 100644 (file)
--- 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 c6dbbed9c1676b5eac9bed64b1ca0f688ffebbd9..a76417da81a671b61903f6e31bd7a416923e12d3 100644 (file)
--- 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 5fe137f19e64bf47cdb95a7b1e476188fb6b865b..93dfc1c5f8c00045a8d856146ec0aac2090511ae 100644 (file)
--- 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 a770abba30aac1d18158e9f7364d360d134fbbe2..19335fbc7cfb887f4b54d0717167379d1b118769 100644 (file)
--- 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