From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 28 Aug 2011 19:44:51 +0000 (+0200)
Subject: obvious bugfixes :P
X-Git-Tag: xonotic-v0.6.0~188^2~4^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4612d7eb9d5f85ffd1efa6ef5b58df3a86bd4d8;p=xonotic%2Fxonotic-data.pk3dir.git

obvious bugfixes :P
---

diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc
index a214c660e..2214fed4d 100644
--- a/qcsrc/server/bot/waypoints.qc
+++ b/qcsrc/server/bot/waypoints.qc
@@ -945,10 +945,10 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en
 		w = find(world, classname, "waypoint");
 		while (w)
 		{
-			if(w != wp)
+			if(w != wp && !(w.wpflags & WAYPOINTFLAG_NORELINK))
 			{
 				float d;
-				d = vlen(wp.origin - w.origin) + vlen(w.origin + porg);
+				d = vlen(wp.origin - w.origin) + vlen(w.origin - porg);
 				if(d < bestdist)
 					if(navigation_waypoint_will_link(wp.origin, w.origin, p, walkfromwp, 1050))
 						if(navigation_waypoint_will_link(w.origin, porg, p, walkfromwp, 1050))
@@ -961,7 +961,7 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en
 		}
 		if(bestdist < maxdist)
 		{
-			print("update chain from ", etos(p.fld), " to new nearest WP ", etos(p.fld), "\n");
+			print("update chain to new nearest WP ", etos(p.fld), "\n");
 			return 0;
 		}