move check to child tile

CleverRaven · Jun 4, 2024 · e57064b · e57064b
1 parent 25083c1
commit e57064b
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/pathfinding.cpp b/src/pathfinding.cpp
@@ -256,12 +256,6 @@ std::vector<tripoint> map::route( const tripoint &f, const tripoint &t,
             continue;
         }
 
-        if( cur != f && cur != t && avoid( cur ) ) {
-            layer.closed[parent_index] = true;
-            continue;
-        }
-
-
         if( layer.gscore[parent_index] > max_length ) {
             // Shortest path would be too long, return empty vector
             return std::vector<tripoint>();
@@ -291,6 +285,11 @@ std::vector<tripoint> map::route( const tripoint &f, const tripoint &t,
                 continue;
             }
 
+            if( p != t && avoid( p ) ) {
+                layer.closed[index] = true;
+                continue;
+            }
+
             if( layer.closed[index] ) {
                 continue;
             }