cpp/openttd-patchpack/source Changeset - r21224:38abbc2b71e0

Changeset - r21224:38abbc2b71e0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 10 years ago 2014-02-06 21:05:00
rubidium@openttd.org

(svn r26312) -Codechange: iterate the nearby tiles instead of the industry list for a conflicting industry when the number of industries is really large (MJP)

1 file changed with 24 insertions and 1 deletions:

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1563,7 +1563,30 @@ static bool CheckIfCanLevelIndustryPlatf @@
 static CommandCost CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, int type)
+{
 	const IndustrySpec *indspec = GetIndustrySpec(type);
 	const Industry *i;
 	const Industry *i = NULL;
 	/* On a large map with many industries, it may be faster to check an area. */
 	const int dmax = 14;
 	if (Industry::GetNumItems() > (size_t) (dmax * dmax * 2)) {
 		const int tx = TileX(tile);
 		const int ty = TileY(tile);
 		TileArea tile_area = TileArea(TileXY(max(0, tx - dmax), max(0, ty - dmax)), TileXY(min(MapMaxX(), tx + dmax), min(MapMaxY(), ty + dmax)));
 		TILE_AREA_LOOP(atile, tile_area) {
 			if (GetTileType(atile) == MP_INDUSTRY) {
 				const Industry *i2 = Industry::GetByTile(atile);
 				if (i == i2) continue;
 				i = i2;
 				if (DistanceMax(tile, i->location.tile) > dmax) continue;
 				if (i->type == indspec->conflicting[0] ||
 						i->type == indspec->conflicting[1] ||
 						i->type == indspec->conflicting[2]) {
 					return_cmd_error(STR_ERROR_INDUSTRY_TOO_CLOSE);
+				}
+			}
+		}
 		return CommandCost();
+	}
 	FOR_ALL_INDUSTRIES(i) {
 		/* Within 14 tiles from another industry is considered close */
 		if (DistanceMax(tile, i->location.tile) > 14) continue;

0 comments (0 inline, 0 general)