From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 18 Jul 2010 16:39:02 +0000 (+0200)
Subject: fix electro beam aim; fix animtime (must not be zero or network spam)
X-Git-Tag: xonotic-v0.1.0preview~423^2~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94484151805d7d493b1932e5dfaf976ddbe3fd21;p=xonotic%2Fxonotic-data.pk3dir.git

fix electro beam aim; fix animtime (must not be zero or network spam)
---

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 8c7b4b652..ac93a59d0 100644
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -313,7 +313,7 @@ set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
 set g_balance_electro_primary_refire 0
-set g_balance_electro_primary_animtime 0
+set g_balance_electro_primary_animtime 0.05
 set g_balance_electro_primary_ammo 40
 set g_balance_electro_primary_range 800
 set g_balance_electro_primary_velocityfactor 45
diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index fad804a8f..ede9c0667 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -313,7 +313,7 @@ set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
 set g_balance_electro_primary_refire 0
-set g_balance_electro_primary_animtime 0
+set g_balance_electro_primary_animtime 0.05
 set g_balance_electro_primary_ammo 40
 set g_balance_electro_primary_range 800
 set g_balance_electro_primary_velocityfactor 45
diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index eca589c48..330adee16 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -202,7 +202,7 @@ void lgbeam_think()
 	vector force;
 	force = angle * cvar("g_balance_electro_primary_force");
 
-	traceline_antilag(self.owner, self.owner.origin, self.owner.origin + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
+	traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
 
 	self.scale = vlen(self.owner.origin - trace_endpos) / 256 * (0.75 + 0.75 * random());
 }
@@ -231,7 +231,7 @@ void exteriorlgbeam_think()
 	vector angle;
 	angle = v_forward;
 
-	traceline_antilag(self.owner, self.owner.origin, self.owner.origin + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
+	traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
 
 	// apply the damage
 	if(trace_fraction < 1)