Jumppad waypoint creation: filter jumppad targets with move_movetype MOVETYPE_NONE...

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index cc71897b18cc1890bab9cb460167b2731cbe0821..64c15bda59a5ed3e2dd7830b0725bbe4cb4bf0b7 100644 (file)
--- 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);