From c2349948123cd3ff49676fc310c10b0fb676aefe Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 22 May 2017 15:25:47 +0200 Subject: [PATCH] Fix navigation_findnearestwaypoint improperly testing if a teleport/warpzone/jumppad waypoint can be linked to an item or player. It's also good as optimization --- qcsrc/server/bot/default/navigation.qc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 891ad3c15..4598d01ba 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -454,6 +454,9 @@ entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfrom waypoint_clearlinks(ent); // initialize wpXXmincost fields IL_EACH(g_waypoints, it != ent, { + if(walkfromwp && (it.wpflags & WAYPOINTFLAG_NORELINK)) + continue; + if(it.wpisbox) { vector wm1 = it.absmin; @@ -472,6 +475,9 @@ entity navigation_findnearestwaypoint_withdist_except(entity ent, float walkfrom // box check failed, try walk IL_EACH(g_waypoints, it != ent, { + if(walkfromwp && (it.wpflags & WAYPOINTFLAG_NORELINK)) + continue; + if(it.wpisbox) { vector wm1 = it.origin + it.mins; -- 2.39.2