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

(svn r18716) -Codechange: pass a TileArea to FindStationsAroundTiles

release/1.0
rubidium 2010-01-04 18:16:32 +00:00
parent 31b325baaf
commit 71f2789270
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/api/ai_industry.cpp
View File

@ -124,7 +124,7 @@
Industry *ind = ::Industry::Get(industry_id); Industry *ind = ::Industry::Get(industry_id);
StationList stations; StationList stations;
::FindStationsAroundTiles(ind->xy, ind->width, ind->height, &stations); ::FindStationsAroundTiles(TileArea(ind->xy, ind->width, ind->height), &stations);
return (int32)stations.Length(); return (int32)stations.Length();
} }

2
src/industry_cmd.cpp
View File

@ -2066,7 +2066,7 @@ static int WhoCanServiceIndustry(Industry *ind)
{ {
/* Find all stations within reach of the industry */ /* Find all stations within reach of the industry */
StationList stations; StationList stations;
FindStationsAroundTiles(ind->xy, ind->width, ind->height, &stations); FindStationsAroundTiles(TileArea(ind->xy, ind->width, ind->height), &stations);
if (stations.Length() == 0) return 0; // No stations found at all => nobody services if (stations.Length() == 0) return 0; // No stations found at all => nobody services

16
src/station_cmd.cpp
View File

@ -2997,19 +2997,17 @@ CommandCost CmdRenameStation(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
/** /**
* Find all stations around a rectangular producer (industry, house, headquarter, ...) * Find all stations around a rectangular producer (industry, house, headquarter, ...)
* *
* @param tile North tile of producer * @param location The location/area of the producer
* @param w_prod X extent of producer
* @param h_prod Y extent of producer
* @param stations The list to store the stations in * @param stations The list to store the stations in
*/ */
void FindStationsAroundTiles(TileIndex tile, int w_prod, int h_prod, StationList *stations) void FindStationsAroundTiles(const TileArea &location, StationList *stations)
{ {
/* area to search = producer plus station catchment radius */ /* area to search = producer plus station catchment radius */
int max_rad = (_settings_game.station.modified_catchment ? MAX_CATCHMENT : CA_UNMODIFIED); int max_rad = (_settings_game.station.modified_catchment ? MAX_CATCHMENT : CA_UNMODIFIED);
for (int dy = -max_rad; dy < h_prod + max_rad; dy++) { for (int dy = -max_rad; dy < location.h + max_rad; dy++) {
for (int dx = -max_rad; dx < w_prod + max_rad; dx++) { for (int dx = -max_rad; dx < location.w + max_rad; dx++) {
TileIndex cur_tile = TileAddWrap(tile, dx, dy); TileIndex cur_tile = TileAddWrap(location.tile, dx, dy);
if (cur_tile == INVALID_TILE || !IsTileType(cur_tile, MP_STATION)) continue; if (cur_tile == INVALID_TILE || !IsTileType(cur_tile, MP_STATION)) continue;
Station *st = Station::GetByTile(cur_tile); Station *st = Station::GetByTile(cur_tile);
@ -3017,7 +3015,7 @@ void FindStationsAroundTiles(TileIndex tile, int w_prod, int h_prod, StationList
if (_settings_game.station.modified_catchment) { if (_settings_game.station.modified_catchment) {
int rad = st->GetCatchmentRadius(); int rad = st->GetCatchmentRadius();
if (dx < -rad || dx >= rad + w_prod || dy < -rad || dy >= rad + h_prod) continue; if (dx < -rad || dx >= rad + location.w || dy < -rad || dy >= rad + location.h) continue;
} }
/* Insert the station in the set. This will fail if it has /* Insert the station in the set. This will fail if it has
@ -3035,7 +3033,7 @@ void FindStationsAroundTiles(TileIndex tile, int w_prod, int h_prod, StationList
const StationList *StationFinder::GetStations() const StationList *StationFinder::GetStations()
{ {
if (this->tile != INVALID_TILE) { if (this->tile != INVALID_TILE) {
FindStationsAroundTiles(this->tile, this->w, this->h, &this->stations); FindStationsAroundTiles(*this, &this->stations);
this->tile = INVALID_TILE; this->tile = INVALID_TILE;
} }
return &this->stations; return &this->stations;

2
src/station_func.h
View File

@ -22,7 +22,7 @@
void ModifyStationRatingAround(TileIndex tile, Owner owner, int amount, uint radius); void ModifyStationRatingAround(TileIndex tile, Owner owner, int amount, uint radius);
void FindStationsAroundTiles(TileIndex tile, int w_prod, int h_prod, StationList *stations); void FindStationsAroundTiles(const TileArea &location, StationList *stations);
void ShowStationViewWindow(StationID station); void ShowStationViewWindow(StationID station);
void UpdateAllStationVirtCoords(); void UpdateAllStationVirtCoords();