From c1d2e4bc8e37a8dd1216447bff15fad79e962ad7 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 1 May 2017 01:57:23 +0200 Subject: [PATCH] yay! Fix bug causing bots to ignore teleports and warpzones --- qcsrc/server/bot/default/navigation.qc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 26eb403298..840ca49f17 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; -- 2.39.2