summaryrefslogtreecommitdiff
path: root/src/terraform_gui.cpp
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2021-01-08 10:16:18 +0000
committerGitHub <noreply@github.com>2021-01-08 11:16:18 +0100
commit9b800a96ed32720ff60b74e498a0e0a6351004f9 (patch)
tree3f287d339e15c4902ee415556475fd9b2918d33c /src/terraform_gui.cpp
parentc1fddb9a6ae5c3af6865461a7295788a341011a2 (diff)
downloadopenttd-9b800a96ed32720ff60b74e498a0e0a6351004f9.tar.xz
Codechange: Remove min/max functions in favour of STL variants (#8502)
Diffstat (limited to 'src/terraform_gui.cpp')
-rw-r--r--src/terraform_gui.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 9f727ce72..2f017e6b1 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -409,13 +409,13 @@ static void CommonRaiseLowerBigLand(TileIndex tile, int mode)
/* Raise land */
h = MAX_TILE_HEIGHT;
TILE_AREA_LOOP(tile2, ta) {
- h = min(h, TileHeight(tile2));
+ h = std::min(h, TileHeight(tile2));
}
} else {
/* Lower land */
h = 0;
TILE_AREA_LOOP(tile2, ta) {
- h = max(h, TileHeight(tile2));
+ h = std::max(h, TileHeight(tile2));
}
}
@@ -547,8 +547,8 @@ struct ScenarioEditorLandscapeGenerationWindow : Window {
{
if (widget != WID_ETT_DOTS) return;
- size->width = max<uint>(size->width, ScaleGUITrad(59));
- size->height = max<uint>(size->height, ScaleGUITrad(31));
+ size->width = std::max<uint>(size->width, ScaleGUITrad(59));
+ size->height = std::max<uint>(size->height, ScaleGUITrad(31));
}
void DrawWidget(const Rect &r, int widget) const override