From cc188c9339c61f49ffb597a9c423a887866e7931 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 31 Jul 2017 10:12:07 +0200 Subject: [PATCH] Jumppad waypoint creation: filter jumppad targets with move_movetype MOVETYPE_NONE earlier --- qcsrc/common/triggers/trigger/jumppads.qc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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); -- 2.39.2