From: terencehill <piuntn@gmail.com>
Date: Sun, 30 Apr 2017 23:57:23 +0000 (+0200)
Subject: yay! Fix bug causing bots to ignore teleports and warpzones
X-Git-Tag: xonotic-v0.8.5~2378^2~170
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1d2e4bc8e37a8dd1216447bff15fad79e962ad7;p=xonotic%2Fxonotic-data.pk3dir.git

yay! Fix bug causing bots to ignore teleports and warpzones
---

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 26eb40329..840ca49f1 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -528,7 +528,7 @@ float navigation_markroutes_nearestwaypoints(entity this, float maxdist)
 }
 
 // updates a path link if a spawnfunc_waypoint link is better than the current one
-void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vector p)
+void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost, vector p)
 {
 	vector m1;
 	vector m2;
@@ -543,10 +543,13 @@ void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vecto
 	}
 	else
 		v = wp.origin;
-	cost2 += waypoint_getdistancecost(p, v);
-	if (wp.wpcost > cost2)
+	if (w.wpflags & WAYPOINTFLAG_TELEPORT)
+		cost += w.wp00mincost; // assuming teleport has exactly one destination
+	else
+		cost += waypoint_getdistancecost(p, v);
+	if (wp.wpcost > cost)
 	{
-		wp.wpcost = cost2;
+		wp.wpcost = cost;
 		wp.enemy = w;
 		wp.wpfire = 1;
 		wp.wpnearestpoint = v;