Use the normal secondary spread cvar

diff --git a/balance25.cfg b/balance25.cfg
index 079af475b830bd5d5f042030c12c1c646ad2702e..d40ae54a665392a759faf64c05cb7761a0a57d15 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -540,7 +540,6 @@ 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_spread 0.08
 set g_balance_hagar_secondary_load_canhold 0
 set g_balance_hagar_secondary_damage 37
 set g_balance_hagar_secondary_edgedamage 15

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 8ab078ffc178744a40b7709bcb7fe7f949a27508..815e0df2f4f434f2e9f1428652b3809099dd0c9d 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -540,7 +540,6 @@ 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_spread 0.08
 set g_balance_hagar_secondary_load_canhold 0
 set g_balance_hagar_secondary_damage 43
 set g_balance_hagar_secondary_edgedamage 15

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index a0b2106ee5a27e9ca7a36ef071e4402496be1569..cfd4c9df7317c4c7a603d0ef22f2b155fa4dcb93 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -540,7 +540,6 @@ 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_spread 0.08
 set g_balance_hagar_secondary_load_canhold 0
 set g_balance_hagar_secondary_damage 35
 set g_balance_hagar_secondary_edgedamage 17.5

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index b6b76c443b04744c1626552acaa773b57a8d100a..843f5ddb631a9fc52971258924e7fc9ca194b07f 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -540,13 +540,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_spread 0.08
 set g_balance_hagar_secondary_load_canhold 0
 set g_balance_hagar_secondary_damage 18
 set g_balance_hagar_secondary_edgedamage 6
 set g_balance_hagar_secondary_force 70
 set g_balance_hagar_secondary_radius 125
-set g_balance_hagar_secondary_spread 0.15
+set g_balance_hagar_secondary_spread 0.08
 set g_balance_hagar_secondary_speed 1800
 set g_balance_hagar_secondary_lifetime_min 5
 set g_balance_hagar_secondary_lifetime_rand 0

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 473fc2642a5d0df0828130f3ffb326d5c22b6c29..38e2efd48d52e385833b891184c699c6932d94fb 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -539,7 +539,6 @@ 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_spread 0.08
 set g_balance_hagar_secondary_load_canhold 0
 set g_balance_hagar_secondary_damage 30
 set g_balance_hagar_secondary_edgedamage 15

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 137cd72b4f1efe81f0a4f6774736264c87959cc3..c6dbbed9c1676b5eac9bed64b1ca0f688ffebbd9 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -318,7 +318,6 @@ 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_spread;
 float autocvar_g_balance_hagar_secondary_load_canhold;
 float autocvar_g_balance_hagar_secondary_ammo;
 float autocvar_g_balance_hagar_secondary_damage;

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index c54164299a8f05cbbbeeeb2100efab68483d94b5..53419540060eb80a63d176a0404d40703ba3e15b 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -211,7 +211,7 @@ void W_Hagar_Attack2_Load (void)
                                s_y = v_forward_x;
                                s_z = v_forward_y;
                        }
-                       s = s * autocvar_g_balance_hagar_secondary_load_spread * g_weaponspreadfactor;
+                       s = s * cvar("g_balance_hagar_secondary_spread") * g_weaponspreadfactor;
                        W_SetupProjectileVelocityEx(missile, w_shotdir + right * s_y + up * s_z, v_up, cvar("g_balance_hagar_secondary_speed"), 0, 0, 0, FALSE);
 
                        missile.angles = vectoangles (missile.velocity);