Ticket #3376: use_passability_grid.patch

source/simulation2/components/CCmpPathfinder.cpp

@@ -794 +794 @@
     entity_pos_t x0, entity_pos_t z0, entity_pos_t x1, entity_pos_t z1, entity_pos_t r,
     pass_class_t passClass)
 {
-    // Test against obstructions first
+    // Test against obstructions first. Pathfinding-blocking obstructions are not handled here.
     CmpPtr<ICmpObstructionManager> cmpObstructionManager(GetSystemEntity());
-    if (!cmpObstructionManager)
+    if (!cmpObstructionManager || cmpObstructionManager->TestLine(filter, x0, z0, x1, z1, r))
         return false;
 
-    if (cmpObstructionManager->TestLine(filter, x0, z0, x1, z1, r))
-        return false;
-
-    // Then test against the terrain
-    return Pathfinding::CheckLineMovement(x0, z0, x1, z1, passClass, *m_TerrainOnlyGrid);
+    // Then test against the passability grid.
+    return Pathfinding::CheckLineMovement(x0, z0, x1, z1, passClass, *m_Grid);
 }
 
 ICmpObstruction::EFoundationCheck CCmpPathfinder::CheckUnitPlacement(const IObstructionTestFilter& filter,

source/simulation2/components/ICmpObstructionManager.h

@@ -346 +346 @@
         if (group == m_Group || (group2 != INVALID_ENTITY && group2 == m_Group))
             return false;
 
+        // If an obstruction already blocks tile-based pathfinding, 
+        // it will be handled as part of the terrain passability handling 
+        // and doesn't need to be matched by this filter 
+        if (flags & ICmpObstructionManager::FLAG_BLOCK_PATHFINDING)
+            return false;
+
         if (!(flags & ICmpObstructionManager::FLAG_BLOCK_MOVEMENT))
             return false;