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

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 8c7b4b652d105dc35606475ae471e07d25ada92a..ac93a59d07ffa9f5bbd965401adb9c656476db1d 100644 (file)
--- 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 fad804a8f59b2e71c8fc8b2e7e4d311145aa5d25..ede9c066764650f480d814e10b6b8537c22767f6 100644 (file)
--- 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 eca589c48a63bdf04a3e235b03012986d7096c24..330adee16bea4f5d3c9af2062593e322ac858361 100644 (file)
--- 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)