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/genworld_gui.cpp | |
| parent | c1fddb9a6ae5c3af6865461a7295788a341011a2 (diff) | |
| download | openttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz | |
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/genworld_gui.cpp')
| -rw-r--r-- | src/genworld_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index 37f3962ec..54ca0bc86 100644 --- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -513,7 +513,7 @@ struct GenerateLandscapeWindow : public Window { } } size->width += padding.width; - size->height = max(size->height, (uint)(FONT_HEIGHT_NORMAL + WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM)); + size->height = std::max(size->height, (uint)(FONT_HEIGHT_NORMAL + WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM)); } void DrawWidget(const Rect &r, int widget) const override @@ -1214,7 +1214,7 @@ struct GenerateProgressWindow : public Window { case WID_GP_PROGRESS_TEXT: for (uint i = 0; i < GWP_CLASS_COUNT; i++) { - size->width = max(size->width, GetStringBoundingBox(_generation_class_table[i]).width); + size->width = std::max(size->width, GetStringBoundingBox(_generation_class_table[i]).width); } size->height = FONT_HEIGHT_NORMAL * 2 + WD_PAR_VSEP_NORMAL; break; |