r3886 - in branches/nexuiz-2.0: . data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-22 09:47:03 -0400 (Tue, 22 Jul 2008)
New Revision: 3886

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
Log:
r3885 | div0 | 2008-07-22 15:46:09 +0200 (Tue, 22 Jul 2008) | 2 lines
add a stupid (but confirmed) skyhook workaround

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-22 13:46:09 UTC (rev 3885)
+++ branches/nexuiz-2.0/.patchsets	2008-07-22 13:47:03 UTC (rev 3886)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3883
+revisions_applied = 1-3885

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2008-07-22 13:46:09 UTC (rev 3885)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2008-07-22 13:47:03 UTC (rev 3886)
@@ -166,6 +166,24 @@
 		return;
 	}
 
+	if(other == world)
+	{
+		vector tic;
+		tic = self.velocity * sys_ticrate;
+		tic = tic + normalize(tic) * vlen(self.maxs - self.mins);
+		traceline(self.origin - tic, self.origin + tic, MOVE_NORMAL, self);
+		if(trace_fraction >= 1)
+		{
+			dprint("Odd... did not hit...?\n");
+		}
+		else if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
+		{
+			dprint("Detected and prevented the sky-grapple bug.\n");
+			RemoveGrapplingHook(self.owner);
+			return;
+		}
+	}
+
 	pointparticles(particleeffectnum("grapple_impact"), self.origin, '0 0 0', 1);
 	sound (self, CHAN_BODY, "weapons/hook_impact.wav", 1, ATTN_NORM);