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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
This commit is contained in:
Jonathan G Rennison
2020-05-14 00:40:16 +01:00
parent a94a8da990 83cd040c61
commit d37d08ebb3
10 changed files with 99 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openttd.cpp
View File

@@ -1485,7 +1485,11 @@ void CheckCaches(bool force_check, std::function<void(const char *)> log)
CCLOG("industry neutral station stations_near mismatch: ind %i, (recalc size: %u, neutral size: %u)", (int)ind->index, (uint)ind->stations_near.size(), (uint)stlist.size());
}
} else {
FindStationsAroundTiles(ind->location, &stlist, false, ind->index);
ForAllStationsAroundTiles(ind->location, [ind, &stlist](Station *st, TileIndex tile) {
if (!IsTileType(tile, MP_INDUSTRY) || GetIndustryIndex(tile) != ind->index) return false;
stlist.insert(st);
return true;
});
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());
}