diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2021-01-08 10:16:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 11:16:18 +0100 |
| commit | 9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch) | |
| tree | 3f287d339e15c4902ee415556475fd9b2918d33c /src/station_kdtree.h | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/station_kdtree.h')
| -rw-r--r-- | src/station_kdtree.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/station_kdtree.h b/src/station_kdtree.h index 321bbacc6..1c91ed3d2 100644 --- a/src/station_kdtree.h +++ b/src/station_kdtree.h @@ -29,10 +29,10 @@ template <typename Func> void ForAllStationsRadius(TileIndex center, uint radius, Func func) { uint16 x1, y1, x2, y2; - x1 = (uint16)max<int>(0, TileX(center) - radius); - x2 = (uint16)min<int>(TileX(center) + radius + 1, MapSizeX()); - y1 = (uint16)max<int>(0, TileY(center) - radius); - y2 = (uint16)min<int>(TileY(center) + radius + 1, MapSizeY()); + x1 = (uint16)std::max<int>(0, TileX(center) - radius); + x2 = (uint16)std::min<int>(TileX(center) + radius + 1, MapSizeX()); + y1 = (uint16)std::max<int>(0, TileY(center) - radius); + y2 = (uint16)std::min<int>(TileY(center) + radius + 1, MapSizeY()); _station_kdtree.FindContained(x1, y1, x2, y2, [&](StationID id) { func(Station::Get(id)); |