Ticket #3785: shortPathfinder.patch

source/simulation2/components/CCmpPathfinder_Vertex.cpp

@@ -656 +656 @@
 
         if (i >= staticShapesNb)
             pathfindClearance = clearance - entity_pos_t::FromInt(1)/2;
-        
+
         // Expand the vertexes by the moving unit's collision radius, to find the
         // closest we can get to it
 
@@ -838 +838 @@
             else
             {
                 npos = vertexes[n].p;
+                // hack to fix cases where a path along an obstruction will end up in an impassable region
+                // TODO fix it properly
+                int i = (npos.X >> Pathfinding::NAVCELL_SIZE_LOG2).ToInt_RoundToNegInfinity();
+                int j = (npos.Y >> Pathfinding::NAVCELL_SIZE_LOG2).ToInt_RoundToNegInfinity();
+                if (!IS_PASSABLE(m_Grid->get(i, j), passClass))
+                    continue;
             }
 
             // Work out which quadrant(s) we're approaching the new vertex from
@@ -853 +859 @@
                 // Hack: Always head towards the goal if possible, to avoid missing it if it's
                 // inside another unit
                 if (n != GOAL_VERTEX_ID)
-                {
                     continue;
-                }
             }
 
             bool visible =