(svn r17439) -Fix (r17436): you weren't paid for cargo delivered to houses and headquarters anymore

1 files changed, 3 insertions, 0 deletions

diff --git a/src/economy.cpp b/src/economy.cpp
index 0b1fd030e..07fefdac1 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -929,6 +929,9 @@ static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID dest, Ti
 	/* Give the goods to the industry. */
 	uint accepted = DeliverGoodsToIndustry(st, cargo_type, num_pieces, src_type == ST_INDUSTRY ? src : INVALID_INDUSTRY);
 
+	/* If there are non-industries around accepting the cargo, accept it all */
+	if (HasBit(st->town_acc, cargo_type)) accepted = num_pieces;
+
 	/* Determine profit */
 	Money profit = GetTransportedGoodsIncome(accepted, DistanceManhattan(source_tile, st->xy), days_in_transit, cargo_type);