From: Samual Lenks <samual@xonotic.org>
Date: Mon, 9 Dec 2013 06:32:12 +0000 (-0500)
Subject: Fix forwardbias
X-Git-Tag: xonotic-v0.8.0~152^2~275
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3222a0502cc7c145d507c009f5a4c62fb697bb91;p=xonotic%2Fxonotic-data.pk3dir.git

Fix forwardbias
---

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index 8d7652361..79d1115dc 100644
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -522,7 +522,7 @@ void W_Shockwave_Attack()
 
 				// figure out the direction of force
 				final_force = (w_shotdir * WEP_CVAR(shockwave, blast_splash_force_forwardbias));
-				final_force = normalize((CENTER_OR_VIEWOFS(head) - attack_hitpos) + final_force);
+				final_force = normalize(CENTER_OR_VIEWOFS(head) - (attack_hitpos - final_force));
 				//te_lightning2(world, attack_hitpos, (attack_hitpos + (final_force * 200)));
 
 				// now multiply the direction by force units
@@ -614,7 +614,7 @@ void W_Shockwave_Attack()
 
 				// figure out the direction of force
 				final_force = (w_shotdir * WEP_CVAR(shockwave, blast_force_forwardbias));
-				final_force = normalize((center - nearest_on_line) + final_force);
+				final_force = normalize(center - (nearest_on_line - final_force));
 				//te_lightning2(world, nearest_on_line, (attack_hitpos + (final_force * 200)));
 
 				// now multiply the direction by force units