]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix navigation_findnearestwaypoint improperly testing if a teleport/warpzone/jumppad...
authorterencehill <piuntn@gmail.com>
Mon, 22 May 2017 13:25:47 +0000 (15:25 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 22 May 2017 13:25:47 +0000 (15:25 +0200)
qcsrc/server/bot/default/navigation.qc

index 891ad3c1551dd2d7c3e0bbc4f1b087b1f2adcd6b..4598d01ba51c8dea09740b192f22818dc3afcca4 100644 (file)
@@ -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;