From: terencehill <piuntn@gmail.com>
Date: Sun, 24 Dec 2017 17:47:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill... 
X-Git-Tag: xonotic-v0.8.5~2378^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4299b97f93fc4753665e198066970bd51bb3b06a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/bot_waypoints' into terencehill/bot_ai

# Conflicts:
#	qcsrc/common/triggers/trigger/jumppads.qc
---

4299b97f93fc4753665e198066970bd51bb3b06a
diff --cc qcsrc/common/triggers/trigger/jumppads.qc
index ded21c377,d10a1e330..5bb6d3987
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.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';