From: Mario <mario@smbclan.net>
Date: Thu, 14 Jan 2016 06:54:54 +0000 (+1000)
Subject: Fix prediction of shotgun melee, but break nade slapping
X-Git-Tag: xonotic-v0.8.2~1248
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b14ac44b1ab336bed15852c382dfcc5c2298ac04;p=xonotic%2Fxonotic-data.pk3dir.git

Fix prediction of shotgun melee, but break nade slapping
---

diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc
index dba351eb6..7da7dfd04 100644
--- a/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@ -124,7 +124,7 @@ void W_Shotgun_Melee_Think()
 			+ (v_up * swing_factor * WEP_CVAR_SEC(shotgun, melee_swing_up))
 			+ (v_right * swing_factor * WEP_CVAR_SEC(shotgun, melee_swing_side)));
 
-		WarpZone_traceline_antilag(self, self.realowner.origin + self.realowner.view_ofs, targpos, false, self, ANTILAG_LATENCY(self.realowner));
+		WarpZone_traceline_antilag(self, self.realowner.origin + self.realowner.view_ofs, targpos, false, self.realowner, ANTILAG_LATENCY(self.realowner));
 
 		// draw lightning beams for debugging
 		//te_lightning2(world, targpos, self.realowner.origin + self.realowner.view_ofs + v_forward * 5 - v_up * 5);