From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 11 Apr 2011 16:05:38 +0000 (+0300)
Subject: Use the normal secondary spread cvar
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~61
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e8940a4a303fc98ce4b39fa78fec3e646b960ee0

Use the normal secondary spread cvar
---

diff --git a/balance25.cfg b/balance25.cfg
index 079af475b..d40ae54a6 100644
--- 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 8ab078ffc..815e0df2f 100644
--- 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 a0b2106ee..cfd4c9df7 100644
--- 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 b6b76c443..843f5ddb6 100644
--- 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 473fc2642..38e2efd48 100644
--- 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 137cd72b4..c6dbbed9c 100644
--- 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 c54164299..534195400 100644
--- 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);