Translate comments in nobHarborBuilding

Author: Flamefire

libs/s25main/buildings/nobHarborBuilding.cpp

@@ -675,25 +675,25 @@ void nobHarborBuilding::AddWare(std::unique_ptr<Ware> ware)
     }
     // When ware should be transported to any other goal we returned above, so now we need to take it
 
-    // Brauchen wir die Ware?
+    // Do we need the ware for an expedition?
     if(expedition.active)
     {
         if((ware->type == GoodType::Boards && expedition.boards < BUILDING_COSTS[BuildingType::HarborBuilding].boards)
            || (ware->type == GoodType::Stones
                && expedition.stones < BUILDING_COSTS[BuildingType::HarborBuilding].stones))
         {
+            // Don't wait for it any longer if it had a goal, i.e. us.
+            // Without a goal it was a "lost" ware.
+            if(ware->GetGoal())
+                RemoveDependentWare(*ware);
+            // Add to expedition
+            world->GetPlayer(player).RemoveWare(*ware);
             if(ware->type == GoodType::Boards)
                 ++expedition.boards;
             else
                 ++expedition.stones;
 
-            // Ware nicht mehr abhängig
-            if(ware->GetGoal())
-                RemoveDependentWare(*ware);
-            // Dann zweigen wir die einfach mal für die Expedition ab
-            world->GetPlayer(player).RemoveWare(*ware);
-
-            // Ggf. ist jetzt alles benötigte da
+            // Could be ready now
             CheckExpeditionReady();
             return;
         }

tests/s25Main/integration/testSeafaring.cpp

@@ -653,11 +653,10 @@ BOOST_FIXTURE_TEST_CASE(AddWareWithUnreachableGoalToHarbor, ShipAndHarborsReadyF
     // 3. Ware reaches harbor and needs to be carried into a storehouse
     // 4. Harbor itself does not accept the ware so another storehouse must be found
     GamePlayer& player = world.GetPlayer(curPlayer);
-    auto& harbors = player.GetBuildingRegister().GetHarbors();
+    const auto& harbors = player.GetBuildingRegister().GetHarbors();
     BOOST_TEST_REQUIRE(harbors.size() >= 2u);
     nobHarborBuilding& harbor1 = *harbors.front();
     nobHarborBuilding& harbor2 = **(++harbors.begin());
-    auto& hq = *player.GetFirstWH();
     auto* wh = static_cast<nobBaseWarehouse*>(BuildingFactory::CreateBuilding(
       world, BuildingType::Storehouse, harbor2.GetPos() + MapPoint(2, 0), curPlayer, Nation::Romans));
     BOOST_TEST_REQUIRE(wh);