Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill...
authorterencehill <piuntn@gmail.com>
Sun, 24 Dec 2017 17:47:43 +0000 (18:47 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 24 Dec 2017 17:47:43 +0000 (18:47 +0100)
# Conflicts:
# qcsrc/common/triggers/trigger/jumppads.qc

1  2 
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/triggers/trigger/jumppads.qh
qcsrc/server/bot/default/bot.qc

@@@ -327,17 -325,7 +328,17 @@@ bool trigger_push_test(entity this, ent
                        entity e = spawn();
                        setsize(e, PL_MIN_CONST, PL_MAX_CONST);
                        e.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP | DPCONTENTS_BOTCLIP;
-                       e.velocity = trigger_push_calculatevelocity(org, t, this.height);
+                       e.velocity = trigger_push_calculatevelocity(org, t, this.height, e);
 +
 +                      if(item)
 +                      {
 +                              setorigin(e, org);
 +                              tracetoss(e, e);
 +                              bool r = (trace_ent == item);
 +                              delete(e);
 +                              return r;
 +                      }
 +
                        vel = e.velocity;
                        vector best_target = '0 0 0';
                        vector best_org = '0 0 0';
Simple merge