From a7f27948f333e7f33fa8fe38fb72de1c516e1bca Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 15 May 2023 04:00:24 -0400
Subject: [PATCH] Waypoints: If a normal & shortcut paths overlap, use the
 normal path

---
 src/k_waypoint.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/k_waypoint.cpp b/src/k_waypoint.cpp
index 191a751ba..640eee0a3 100644
--- a/src/k_waypoint.cpp
+++ b/src/k_waypoint.cpp
@@ -327,6 +327,13 @@ static void K_CompareOverlappingWaypoint
 	boolean pathfindsuccess = false;
 	path_t pathtofinish = {0};
 
+	if (K_GetWaypointIsShortcut(*bestwaypoint) == false
+		&& K_GetWaypointIsShortcut(checkwaypoint) == true)
+	{
+		// If it's a shortcut, don't use it.
+		return;
+	}
+
 	pathfindsuccess =
 		K_PathfindToWaypoint(checkwaypoint, finishline, &pathtofinish, useshortcuts, huntbackwards);