cpp/openttd-patchpack/source Changeset - r12934:d737369db59b

Changeset - r12934:d737369db59b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 15 years ago 2009-09-06 22:05:53
smatz@openttd.org

(svn r17437) -Change: don't accept cargo produced in the same industry (generalise and improve the check used only for valuables)

1 file changed with 4 insertions and 6 deletions:

src/economy.cpp

0 comments (0 inline, 0 general)

src/economy.cpp

➞

Show inline comments

@@ @@ -823,10 +823,6 @@ Money GetTransportedGoodsIncome(uint num @@
+		}
+	}
 	/* zero the distance (thus income) if it's the bank and very short transport. */
 	if (_settings_game.game_creation.landscape == LT_TEMPERATE && cs->label == 'VALU' && dist < 10) return 0;
 	static const int MIN_TIME_FACTOR = 31;
 	static const int MAX_TIME_FACTOR = 255;
@@ @@ -861,7 +857,7 @@ static SmallIndustryList _cargo_delivery @@
  * @param nun_pieces Amount of cargo delivered
  * @return actually accepted pieces of cargo
  */
 static uint DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, uint num_pieces)
+static uint DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, uint num_pieces, IndustryID source)
+{
 	/* Find the nearest industrytile to the station sign inside the catchment area, whose industry accepts the cargo.
 	 * This fails in three cases:
@@ @@ -874,6 +870,8 @@ static uint DeliverGoodsToIndustry(const @@
 	for (uint i = 0; i < st->industries_near.Length() && num_pieces != 0; i++) {
 		Industry *ind = st->industries_near[i];
 		if (ind->index == source) continue;
 		const IndustrySpec *indspec = GetIndustrySpec(ind->type);
 		uint cargo_index;
@@ @@ -929,7 +927,7 @@ static Money DeliverGoods(int num_pieces @@
 	if (cs->town_effect == TE_WATER) st->town->new_act_water += num_pieces;
 	/* Give the goods to the industry. */
 	uint accepted = DeliverGoodsToIndustry(st, cargo_type, num_pieces);
+	uint accepted = DeliverGoodsToIndustry(st, cargo_type, num_pieces, src_type == ST_INDUSTRY ? src : INVALID_INDUSTRY);
 	/* Determine profit */
 	Money profit = GetTransportedGoodsIncome(accepted, DistanceManhattan(source_tile, st->xy), days_in_transit, cargo_type);

0 comments (0 inline, 0 general)