From: terencehill <piuntn@gmail.com>
Date: Mon, 31 Jul 2017 08:12:07 +0000 (+0200)
Subject: Jumppad waypoint creation: filter jumppad targets with move_movetype MOVETYPE_NONE... 
X-Git-Tag: xonotic-v0.8.5~2378^2~107
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc188c9339;p=xonotic%2Fxonotic-data.pk3dir.git

Jumppad waypoint creation: filter jumppad targets with move_movetype MOVETYPE_NONE earlier
---

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index cc71897b1..64c15bda5 100644
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -300,13 +300,7 @@ bool trigger_push_testorigin(entity e, entity targ, entity jp, vector org)
 			}
 		}
 	}
-
-	if(e.move_movetype == MOVETYPE_NONE)
-	{
-		tracebox(trace_endpos, e.mins, e.maxs, trace_endpos - eZ * 1500, true, jp);
-		return true;
-	}
-	return false;
+	return true;
 }
 #endif
 void trigger_push_findtarget(entity this)
@@ -325,6 +319,9 @@ void trigger_push_findtarget(entity this)
 		{
 			++n;
 #ifdef SVQC
+			if(t.move_movetype != MOVETYPE_NONE)
+				continue;
+
 			entity e = spawn();
 			setsize(e, PL_MIN_CONST, PL_MAX_CONST);
 			e.velocity = trigger_push_calculatevelocity(org, t, this.height);