dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix padded tile area being used for industries in FindStationsAroundTiles

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-06-17 02:31:15 +01:00
parent c4d9404d79
commit 92c48d6897
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/industry_cmd.cpp
View File

@@ -1668,7 +1668,7 @@ static void PopulateStationsNearby(Industry *ind)
} }
/* Get our list of nearby stations. */ /* Get our list of nearby stations. */
FindStationsAroundTiles(ind->location, &ind->stations_near, false); FindStationsAroundTiles(ind->location, &ind->stations_near, false, ind->index);
/* Test if industry can accept cargo */ /* Test if industry can accept cargo */
uint cargo_index; uint cargo_index;

2
src/openttd.cpp
View File

@@ -1389,7 +1389,7 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log)
CCLOG("industry stations_near mismatch: ind %i, (old size: %u, new size: %u)", (int)ind->index, (uint)old_industry_stations_nears[i].size(), (uint)ind->stations_near.size()); CCLOG("industry stations_near mismatch: ind %i, (old size: %u, new size: %u)", (int)ind->index, (uint)old_industry_stations_nears[i].size(), (uint)ind->stations_near.size());
} }
StationList stlist; StationList stlist;
FindStationsAroundTiles(ind->location, &stlist, false); FindStationsAroundTiles(ind->location, &stlist, false, ind->index);
if (ind->stations_near != stlist) { if (ind->stations_near != stlist) {
CCLOG("industry FindStationsAroundTiles mismatch: ind %i, (recalc size: %u, find size: %u)", (int)ind->index, (uint)ind->stations_near.size(), (uint)stlist.size()); CCLOG("industry FindStationsAroundTiles mismatch: ind %i, (recalc size: %u, find size: %u)", (int)ind->index, (uint)ind->stations_near.size(), (uint)stlist.size());
} }

3
src/station_cmd.cpp
View File

@@ -4054,7 +4054,7 @@ static void AddNearbyStationsByCatchment(TileIndex tile, StationList *stations,
* @param[out] stations The list to store the stations in * @param[out] stations The list to store the stations in
* @param use_nearby Use nearby station list of industry/town associated with location.tile * @param use_nearby Use nearby station list of industry/town associated with location.tile
*/ */
void FindStationsAroundTiles(const TileArea &location, StationList * const stations, bool use_nearby) void FindStationsAroundTiles(const TileArea &location, StationList * const stations, bool use_nearby, const IndustryID industry_filter)
{ {
if (use_nearby) { if (use_nearby) {
/* Industries and towns maintain a list of nearby stations */ /* Industries and towns maintain a list of nearby stations */
@@ -4092,6 +4092,7 @@ void FindStationsAroundTiles(const TileArea &location, StationList * const stati
/* Test if the tile is within the station's catchment */ /* Test if the tile is within the station's catchment */
TILE_AREA_LOOP(tile, location) { TILE_AREA_LOOP(tile, location) {
if (industry_filter != INVALID_INDUSTRY && (!IsTileType(tile, MP_INDUSTRY) || GetIndustryIndex(tile) != industry_filter)) continue;
if (st->TileIsInCatchment(tile)) { if (st->TileIsInCatchment(tile)) {
stations->insert(st); stations->insert(st);
break; break;

2
src/station_func.h
View File

@@ -23,7 +23,7 @@
void ModifyStationRatingAround(TileIndex tile, Owner owner, int amount, uint radius); void ModifyStationRatingAround(TileIndex tile, Owner owner, int amount, uint radius);
void FindStationsAroundTiles(const TileArea &location, StationList *stations, bool use_nearby = true); void FindStationsAroundTiles(const TileArea &location, StationList *stations, bool use_nearby = true, IndustryID industry_filter = INVALID_INDUSTRY);
void ShowStationViewWindow(StationID station); void ShowStationViewWindow(StationID station);
void UpdateAllStationVirtCoords(); void UpdateAllStationVirtCoords();