File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed
Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -675,25 +675,25 @@ void nobHarborBuilding::AddWare(std::unique_ptr<Ware> ware)
675675 }
676676 // When ware should be transported to any other goal we returned above, so now we need to take it
677677
678- // Brauchen wir die Ware ?
678+ // Do we need the ware for an expedition ?
679679 if (expedition.active )
680680 {
681681 if ((ware->type == GoodType::Boards && expedition.boards < BUILDING_COSTS[BuildingType::HarborBuilding].boards )
682682 || (ware->type == GoodType::Stones
683683 && expedition.stones < BUILDING_COSTS[BuildingType::HarborBuilding].stones ))
684684 {
685+ // Don't wait for it any longer if it had a goal, i.e. us.
686+ // Without a goal it was a "lost" ware.
687+ if (ware->GetGoal ())
688+ RemoveDependentWare (*ware);
689+ // Add to expedition
690+ world->GetPlayer (player).RemoveWare (*ware);
685691 if (ware->type == GoodType::Boards)
686692 ++expedition.boards ;
687693 else
688694 ++expedition.stones ;
689695
690- // Ware nicht mehr abhängig
691- if (ware->GetGoal ())
692- RemoveDependentWare (*ware);
693- // Dann zweigen wir die einfach mal für die Expedition ab
694- world->GetPlayer (player).RemoveWare (*ware);
695-
696- // Ggf. ist jetzt alles benötigte da
696+ // Could be ready now
697697 CheckExpeditionReady ();
698698 return ;
699699 }
You can’t perform that action at this time.
0 commit comments