mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21485) -Codechange: use CircularTileSearch to find whether there's a transmitter nearby

release/1.1
rubidium 2010-12-12 18:18:50 +00:00
parent 02451d8af6
commit 1123d4790f
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/object_cmd.cpp
View File

@ -563,18 +563,15 @@ static void AnimateTile_Object(TileIndex tile)
AnimateNewObjectTile(tile); AnimateNewObjectTile(tile);
} }
/* checks, if a radio tower is within a 9x9 tile square around tile */ /**
static bool IsRadioTowerNearby(TileIndex tile) * Helper function for \c CircularTileSearch.
* @param tile The tile to check.
* @param user Ignored.
* @return True iff the tile has a radio tower.
*/
static bool HasTransmitter(TileIndex tile, void *user)
{ {
TileIndex tile_s = tile - TileDiffXY(min(TileX(tile), 4U), min(TileY(tile), 4U)); return IsTransmitterTile(tile);
uint w = min(TileX(tile), 4U) + 1 + min(MapMaxX() - TileX(tile), 4U);
uint h = min(TileY(tile), 4U) + 1 + min(MapMaxY() - TileY(tile), 4U);
TILE_LOOP(tile, w, h, tile_s) {
if (IsTransmitterTile(tile)) return true;
}
return false;
} }
void GenerateObjects() void GenerateObjects()
@ -608,7 +605,8 @@ void GenerateObjects()
uint h; uint h;
if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == SLOPE_FLAT && h >= TILE_HEIGHT * 4 && !IsBridgeAbove(tile)) { if (IsTileType(tile, MP_CLEAR) && GetTileSlope(tile, &h) == SLOPE_FLAT && h >= TILE_HEIGHT * 4 && !IsBridgeAbove(tile)) {
if (IsRadioTowerNearby(tile)) continue; TileIndex t = tile;
if (CircularTileSearch(&t, 9, HasTransmitter, NULL)) continue;
BuildObject(OBJECT_TRANSMITTER, tile); BuildObject(OBJECT_TRANSMITTER, tile);
IncreaseGeneratingWorldProgress(GWP_OBJECT); IncreaseGeneratingWorldProgress(GWP_OBJECT);