cpp/openttd-patchpack/source Changeset - r23554:d690e3d46135

Changeset - r23554:d690e3d46135

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

PeterN - 6 years ago 2019-03-27 23:10:02
peter@fuzzle.org

Fix: Incorrect display of industry production around tiles. (#7426)

Display of industry production around tiles (as shown when placing a station)
did not take account of the station catchment changes, so still showed production
from an industry even if it was not covered by a tile.

This is fixed by making a set of nearby industries that are covered, instead of
looping over all possible industries.

2 files changed with 12 insertions and 12 deletions:

bin/ai/regression/tst_regression/result.txt

src/station_cmd.cpp

0 comments (0 inline, 0 general)

bin/ai/regression/tst_regression/result.txt

➞

Show inline comments

@@ @@ -8515,58 +8515,56 @@ ERROR: IsEnd() is invalid as Begin() is @@
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 => 8
 --TileList_IndustryProducing--
   Count():             92
   Location ListDump:
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
@@ @@ -8607,48 +8605,50 @@ ERROR: IsEnd() is invalid as Begin() is @@
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 1
 => 0
 => 0
 --TileList_StationType--
   Count():             4
   Location ListDump:
 => 0
 => 0
 => 0
 => 0
 --Town--
   GetTownCount():    28
   Town 0
     IsValidTown():   true
     GetName():       Planfield
     GetPopulation(): 787
     GetLocation():   15508
     GetHouseCount(): 30
     GetRating():     0
     IsCity():        true
   Town 1
     IsValidTown():   true
     GetName():       Trenningville
     GetPopulation(): 243
     GetLocation():   46751

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -491,63 +491,63 @@ static void ShowRejectOrAcceptNews(const @@
  * @param w X extent of the area
  * @param h Y extent of the area
  * @param rad Search radius in addition to the given area
  */
 CargoArray GetProductionAroundTiles(TileIndex tile, int w, int h, int rad)
+{
 	CargoArray produced;
 	int x = TileX(tile);
 	int y = TileY(tile);
 	/* expand the region by rad tiles on each side
 	 * while making sure that we remain inside the board. */
 	int x2 = min(x + w + rad, MapSizeX());
 	int x1 = max(x - rad, 0);
 	int y2 = min(y + h + rad, MapSizeY());
 	int y1 = max(y - rad, 0);
 	assert(x1 < x2);
 	assert(y1 < y2);
 	assert(w > 0);
 	assert(h > 0);
 	std::set<IndustryID> industries;
 	TileArea ta(TileXY(x1, y1), TileXY(x2 - 1, y2 - 1));
 	/* Loop over all tiles to get the produced cargo of
 	 * everything except industries */
 	TILE_AREA_LOOP(tile, ta) AddProducedCargo(tile, produced);
 	/* Loop over the industries. They produce cargo for
 	 * anything that is within 'rad' from their bounding
 	 * box. As such if you have e.g. a oil well the tile
 	 * area loop might not hit an industry tile while
 	 * the industry would produce cargo for the station.
 	TILE_AREA_LOOP(tile, ta) {
 		if (IsTileType(tile, MP_INDUSTRY)) industries.insert(GetIndustryIndex(tile));
 		AddProducedCargo(tile, produced);
+	}
 	/* Loop over the seen industries. They produce cargo for
 	 * anything that is within 'rad' of any one of their tiles.
 	 */
 	const Industry *i;
 	FOR_ALL_INDUSTRIES(i) {
 		if (!ta.Intersects(i->location)) continue;
 	for (IndustryID industry : industries) {
 		const Industry *i = Industry::Get(industry);
 		/* Skip industry with neutral station */
 		if (i->neutral_station != NULL && !_settings_game.station.serve_neutral_industries) continue;
 		for (uint j = 0; j < lengthof(i->produced_cargo); j++) {
 			CargoID cargo = i->produced_cargo[j];
 			if (cargo != CT_INVALID) produced[cargo]++;
+		}
+	}
 	return produced;
+}
 /**
  * Get the acceptance of cargoes around the tile in 1/8.
  * @param tile Center of the search area
  * @param w X extent of area
  * @param h Y extent of area
  * @param rad Search radius in addition to given area
  * @param always_accepted bitmask of cargo accepted by houses and headquarters; can be NULL
  * @param ind Industry associated with neutral station (e.g. oil rig) or NULL
  */
 CargoArray GetAcceptanceAroundTiles(TileIndex tile, int w, int h, int rad, CargoTypes *always_accepted)
+{
 	CargoArray acceptance;

0 comments (0 inline, 0 general)