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

This commit is contained in:
smatz
2009-09-07 07:39:08 +00:00
parent ef42e87e31
commit 5d622fd840
12 changed files with 46 additions and 20 deletions

View File

@@ -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);