Ticket #3785: real_fix.patch

source/simulation2/components/CCmpPathfinder_Vertex.cpp

@@ -831 +831 @@
 
             bool visible = true;
             u16 i, j;
-            Pathfinding::NearestNavcell(vertexes[curr.id].p.X, vertexes[curr.id].p.Y, i, j, m_Grid->m_W, m_Grid->m_H);
-            if (!IS_PASSABLE(m_Grid->get(i, j), passClass))
+
+            Pathfinding::NearestNavcell(npos.X, npos.Y, i, j, m_Grid->m_W, m_Grid->m_H);
+            // we may not go on impassable vertexes, so close it if this vertex is like that.
+            // lazily computed for performance.
+            // NB: this is only possible because we do not add the "search area" edges,
+            // and some obstructions may create vertexes outside of it where terrain edges are not computed.
+            if (!IS_PASSABLE(m_TerrainOnlyGrid->get(i, j), passClass))
             {
-                Pathfinding::NearestNavcell(npos.X, npos.Y, i, j, m_Grid->m_W, m_Grid->m_H);
-                // Do not allow path between two impassable vertexes to prevent cases
-                // where a path along an obstruction will end up in an impassable region
-                if (!IS_PASSABLE(m_Grid->get(i, j), passClass))
-                    visible = false;
+                vertexes[n].status = Vertex::CLOSED;
+                continue;
             }
 
             visible = visible &&