From 75ec6637972843bea6caab905a09198f8291d328 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 20 Jul 2008 16:14:56 +0000 Subject: [PATCH] impulse 911: also rule out looking at just sky git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3849 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_impulse.qc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/cl_impulse.qc b/data/qcsrc/server/cl_impulse.qc index a35877e78..e0febc51b 100644 --- a/data/qcsrc/server/cl_impulse.qc +++ b/data/qcsrc/server/cl_impulse.qc @@ -326,16 +326,20 @@ void ImpulseCommands (void) end_x = org_x + random() * delta_x; end_y = org_y + random() * delta_y; end_z = org_z + random() * delta_z; - end = start + normalize(end - start) * 256; + end = start + normalize(end - start) * vlen(delta); // rule 3: start TO end must not be too short tracebox(start, self.mins, self.maxs, end, MOVE_NORMAL, self); if(trace_startsolid) continue; - if(trace_fraction < 1) + if(trace_fraction < 256 / vlen(delta)) continue; - // rule 4: we must not end up in trigger_hurt + // rule 4: don't want to look at sky + if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY) + continue; + + // rule 5: we must not end up in trigger_hurt if(tracebox_hits_trigger_hurt(start, self.mins, self.maxs, enddown)) { dprint("trigger_hurt! ouch! and nothing else could find it!\n"); -- 2.39.2