Avoid incomplete paths are failing too soon. Fixes #1217

beyond-all-reason · Jan 18, 2024 · ff7ac35 · ff7ac35
1 parent 21afcff
commit ff7ac35
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/rts/Sim/MoveTypes/GroundMoveType.cpp b/rts/Sim/MoveTypes/GroundMoveType.cpp
@@ -2192,6 +2192,17 @@ bool CGroundMoveType::CanSetNextWayPoint(int thread) {
 		//
 		// atEndOfPath |= (currWayPoint == nextWayPoint);
 		atEndOfPath |= (curGoalDistSq <= minGoalDistSq);
+
+		if (!atEndOfPath) {
+			lastWaypoint |= (earlyCurrWayPoint.same(earlyNextWayPoint)
+						&& pathManager->CurrentWaypointIsUnreachable(pathID)
+						&& (cwpDistSq <= minGoalDistSq));
+			if (lastWaypoint) {
+				// incomplete path and last valid waypoint has been reached.
+				pathingFailed = true;
+				return false;
+			}
+		}
 	}
 
 	if (atEndOfPath) {
@@ -2232,13 +2243,6 @@ void CGroundMoveType::SetNextWayPoint(int thread)
 
 		// Prevent delay repaths because the waypoints have been updated.
 		wantRepath = false;
-
-		lastWaypoint |= (earlyCurrWayPoint.same(earlyNextWayPoint) && pathManager->CurrentWaypointIsUnreachable(pathID));
-		if (lastWaypoint) {
-			// incomplete path and last valid waypoint has been reached.
-			// ReRequestPath(false);
-			pathingFailed = true;
-		}
 	}
 
 	if (earlyNextWayPoint.x == -1.0f && earlyNextWayPoint.z == -1.0f) {