From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 10 Jan 2015 05:32:13 +0000 (-0800)
Subject: Fix detection of useless waypoints.
X-Git-Tag: xonotic-v0.8.0~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e63762c218b7476551984f6745292ca681f9bdf5;p=xonotic%2Fxonotic-data.pk3dir.git

Fix detection of useless waypoints.
---

diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc
index 4118b6b76..79c441586 100644
--- a/qcsrc/server/bot/waypoints.qc
+++ b/qcsrc/server/bot/waypoints.qc
@@ -1070,6 +1070,7 @@ void botframe_deleteuselesswaypoints()
 	}
 	for (w = world; (w = find(w, classname, "waypoint")); )
 	{
+		w.wpflags |= WAYPOINTFLAG_DEAD_END;
 		w.wpflags &= ~WAYPOINTFLAG_USEFUL;
 		// WP is useful if:
 		if (w.wpflags & WAYPOINTFLAG_ITEM)
@@ -1097,11 +1098,17 @@ void botframe_deleteuselesswaypoints()
 				continue;
 			for (j = 0; j < 32; ++j)
 			{
-				w2 = waypoint_get_link(w1, i);
+				w2 = waypoint_get_link(w, j);
 				if (!w2)
 					break;
+				if (w1 == w2)
+					continue;
 				if (w2.wpflags & WAYPOINTFLAG_PERSONAL)
 					continue;
+				// If we got here, w1 != w2 exist with w1 -> w
+				// and w -> w2. That means the waypoint is not
+				// a dead end.
+				w.wpflags &= ~WAYPOINTFLAG_DEAD_END;
 				for (k = 0; k < 32; ++k)
 				{
 					if (waypoint_get_link(w1, k) == w2)
@@ -1109,14 +1116,18 @@ void botframe_deleteuselesswaypoints()
 					// IF WE GET HERE, w is proven useful
 					// to get from w1 to w2!
 					w.wpflags |= WAYPOINTFLAG_USEFUL;
-					continue;
+					goto next;
 				}
 			}
+:next
 		}
 	}
+	// d) The waypoint is a dead end. Dead end waypoints must be kept as
+	//     they are needed to complete routes while autowaypointing.
+
 	for (w = world; (w = find(w, classname, "waypoint")); )
 	{
-		if (!(w.wpflags & WAYPOINTFLAG_USEFUL))
+		if (!(w.wpflags & (WAYPOINTFLAG_USEFUL | WAYPOINTFLAG_DEAD_END)))
 		{
 			printf("Removed a waypoint at %v. Try again for more!\n", w.origin);
 			te_explosion(w.origin);
@@ -1141,7 +1152,8 @@ void botframe_autowaypoints()
 		//te_explosion(p.botframe_autowaypoints_lastwp0.origin);
 	}
 
-	// TODO(divVerent): For some reason this always removes newly created WPs. Need to figure out why.
-	//botframe_deleteuselesswaypoints();
+	if (autocvar_g_waypointeditor_auto >= 2) {
+		botframe_deleteuselesswaypoints();
+	}
 }