Merge pull request #1889 from Noseey/pathfinding_rejects

Pathfinding: reject unconnected buildings / construction sites in specific scenarios

Author: Flamefire

libs/s25main/GamePlayer.cpp

@@ -804,6 +804,13 @@ void GamePlayer::ToolOrderProcessed(Tool tool)
 
 bool GamePlayer::FindWarehouseForJob(const Job job, noRoadNode& goal) const
 {
+    // Optimization: return early if building is isolated
+    if(goal.GetType() == NodalObjectType::Building || goal.GetType() == NodalObjectType::Buildingsite)
+    {
+        if(!static_cast<noBaseBuilding&>(goal).IsConnected())
+            return false;
+    }
+
     nobBaseWarehouse* wh = FindWarehouse(goal, FW::HasFigure(job, true), false, false);
 
     if(wh)
@@ -1026,6 +1033,10 @@ noBaseBuilding* GamePlayer::FindClientForWare(const Ware& ware)
             // Bei Baustellen die Extraliste abfragen
             for(noBuildingSite* bldSite : buildings.GetBuildingSites())
             {
+                // Optimization: Ignore if unconnected
+                if(!bldSite->IsConnected())
+                    continue;
+
                 unsigned points = bldSite->CalcDistributionPoints(gt);
                 if(!points)
                     continue;
@@ -1039,6 +1050,10 @@ noBaseBuilding* GamePlayer::FindClientForWare(const Ware& ware)
             // Für übrige Gebäude
             for(nobUsual* bld : buildings.GetBuildings(bldType))
             {
+                // Optimization: Ignore if unconnected
+                if(!bld->IsConnected())
+                    continue;
+
                 unsigned points = bld->CalcDistributionPoints(gt);
                 if(!points)
                     continue; // Ware not needed
@@ -1140,12 +1155,16 @@ nobBaseMilitary* GamePlayer::FindClientForCoin(const Ware& ware) const
     // Militärgebäude durchgehen
     for(nobMilitary* milBld : buildings.GetMilitaryBuildings())
     {
-        unsigned way_points;
+        // Optimization: Ignore if unconnected
+        if(!milBld->IsConnected())
+            continue;
 
         points = milBld->CalcCoinsPoints();
         // Wenn 0, will er gar keine Münzen (Goldzufuhr gestoppt)
         if(points)
         {
+            unsigned way_points;
+
             // Weg dorthin berechnen
             if(world.FindPathForWareOnRoads(*ware.GetLocation(), *milBld, &way_points) != RoadPathDirection::None)
             {

libs/s25main/buildings/noBaseBuilding.cpp

@@ -207,6 +207,23 @@ MapPoint noBaseBuilding::GetFlagPos() const
     return world->GetNeighbour(pos, Direction::SouthEast);
 }
 
+bool noBaseBuilding::IsConnected() const
+{
+    // Harbors are always considered connected via sea
+    if(GetBuildingType() == BuildingType::HarborBuilding)
+        return true;
+
+    const helpers::EnumArray<RoadSegment*, Direction>& routes = GetFlag()->getRoutes();
+    // Check paths in all directions except back to building
+    for(const auto dir : helpers::EnumRange<Direction>{})
+    {
+        if(dir != Direction::NorthWest && routes[dir])
+            return true;
+    }
+
+    return false;
+}
+
 void noBaseBuilding::WareNotNeeded(Ware* ware)
 {
     if(!ware)

libs/s25main/buildings/noBaseBuilding.h

@@ -57,6 +57,8 @@ class noBaseBuilding : public noRoadNode
     noFlag* GetFlag() const;
     /// Same as GetFlag()->GetPos()
     MapPoint GetFlagPos() const;
+    /// Is the building (flag) connected to anything?
+    bool IsConnected() const;
 
     /// Return the offset of the door, which is also where people disappear into the building, the builder is building
     /// and the wares are lying

libs/s25main/buildings/noBuildingSite.cpp

@@ -148,6 +148,10 @@ void noBuildingSite::OrderConstructionMaterial()
     if(state == BuildingSiteState::Planing)
         return;
 
+    // Optimization: return early if building is isolated
+    if(!IsConnected())
+        return;
+
     // Bretter
     GamePlayer& owner = world->GetPlayer(player);
     for(int i = used_boards + boards + ordered_boards.size(); i < BUILDING_COSTS[bldType_].boards; ++i)