From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 30 Oct 2010 19:21:51 +0000 (+0200)
Subject: fix some draw issues with the hook
X-Git-Tag: xonotic-v0.1.0preview~228
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=ee1b8d51f50d3f8c6948e81441ac03ae0f52781d;p=xonotic%2Fxonotic-data.pk3dir.git

fix some draw issues with the hook
---

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index cb2d7f356..a995970b4 100644
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -189,8 +189,16 @@ void Draw_GrapplingHook()
 	{
 		default:
 		case ENT_CLIENT_HOOK:
-			setorigin(self, trace_endpos); // hook endpoint!
-			self.angles = vectoangles(trace_endpos - atrans);
+			if(vlen(trace_endpos - atrans) > 0.5)
+			{
+				setorigin(self, trace_endpos); // hook endpoint!
+				self.angles = vectoangles(trace_endpos - atrans);
+				self.drawmask = MASK_NORMAL;
+			}
+			else
+			{
+				self.drawmask = 0;
+			}
 			break;
 		case ENT_CLIENT_LGBEAM:
 		case ENT_CLIENT_GAUNTLET:
diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index ce3d9b72b..b5eb282da 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -268,7 +268,7 @@ void GrapplingHookThink()
 	}
 
 	makevectors(self.angles_x * '-1 0 0' + self.angles_y * '0 1 0');
-	myorg = WarpZone_RefSys_TransformOrigin(self, self.owner, self.origin) + v_forward * (-9);
+	myorg = WarpZone_RefSys_TransformOrigin(self, self.owner, self.origin); // + v_forward * (-9);
 
 	if(myorg != self.hook_start)
 	{