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/town.h | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/town.h')
| -rw-r--r-- | src/town.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/town.h b/src/town.h index 3bb9e10d6..e186951e6 100644 --- a/src/town.h +++ b/src/town.h @@ -299,7 +299,7 @@ void MakeDefaultName(T *obj) * tick 0 is a valid tick so actual amount is one more than the counter value. */ static inline uint16 TownTicksToGameTicks(uint16 ticks) { - return (min(ticks, MAX_TOWN_GROWTH_TICKS) + 1) * TOWN_GROWTH_TICKS - 1; + return (std::min(ticks, MAX_TOWN_GROWTH_TICKS) + 1) * TOWN_GROWTH_TICKS - 1; } |