# HG changeset patch # User rubidium # Date 2010-12-12 18:23:38 # Node ID d5b704fe24fbddd6eaccc5b3267f091ea18c75f6 # Parent db1dd4012898eb5241682ebb24c9029a0622af4f (svn r21486) -Codechange: use TILE_AREA_LOOP for station expansion checks as well diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -84,8 +84,12 @@ bool IsHangar(TileIndex t) template CommandCost GetStationAround(TileArea ta, StationID closest_station, T **st) { + ta.tile -= TileDiffXY(1, 1); + ta.w += 2; + ta.h += 2; + /* check around to see if there's any stations there */ - TILE_LOOP(tile_cur, ta.w + 2, ta.h + 2, ta.tile - TileDiffXY(1, 1)) { + TILE_AREA_LOOP(tile_cur, ta) { if (IsTileType(tile_cur, MP_STATION)) { StationID t = GetStationIndex(tile_cur); @@ -940,7 +944,7 @@ CommandCost CanExpandRailStation(const B } else { /* do not allow modifying non-uniform stations, * the uniform-stations code wouldn't handle it well */ - TILE_LOOP(t, cur_ta.w, cur_ta.h, cur_ta.tile) { + TILE_AREA_LOOP(t, cur_ta) { if (!st->TileBelongsToRailStation(t)) { // there may be adjoined station return_cmd_error(STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED); }