Ticket #3531: 3531 - Fix DISABLE_PATHFINDER option.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -41 +41 @@
 
 // For debugging; units will start going straight to the target
 // instead of calling the pathfinder
-#define DISABLE_PATHFINDER 0
+#define DISABLE_LONGPATHFINDER 0
 
 /**
  * When advancing along the long path, and picking a new waypoint to move
@@ -1313 +1313 @@
     // We are going to recompute our path, so we will use the most recent passability grid
     m_PassabilityMapChangedRecently = false;
 
-#if DISABLE_PATHFINDER
+#if DISABLE_LONGPATHFINDER
     {
         CmpPtr<ICmpPathfinder> cmpPathfinder (GetSimContext(), SYSTEM_ENTITY);
-        CFixedVector2D goalPos = cmpPathfinder->GetNearestPointOnGoal(from, m_FinalGoal);
+        CFixedVector2D goalPos = m_FinalGoal.NearestPointOnGoal(from);
         m_LongPath.m_Waypoints.clear();
         m_ShortPath.m_Waypoints.clear();
         m_ShortPath.m_Waypoints.emplace_back(Waypoint{ goalPos.X, goalPos.Y });