From 9b800a96ed32720ff60b74e498a0e0a6351004f9 Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Fri, 8 Jan 2021 10:16:18 +0000 Subject: Codechange: Remove min/max functions in favour of STL variants (#8502) --- src/tree_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tree_gui.cpp') diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp index ee94c35af..3dab92a20 100644 --- a/src/tree_gui.cpp +++ b/src/tree_gui.cpp @@ -65,8 +65,8 @@ static Dimension GetMaxTreeSpriteSize() for (int i = base; i < base + count; i++) { if (i >= (int)lengthof(tree_sprites)) return size; this_size = GetSpriteSize(tree_sprites[i].sprite, &offset); - size.width = max(size.width, 2 * max(this_size.width, -offset.x)); - size.height = max(size.height, max(this_size.height, -offset.y)); + size.width = std::max(size.width, 2 * std::max(this_size.width, -offset.x)); + size.height = std::max(size.height, std::max(this_size.height, -offset.y)); } return size; -- cgit v1.2.3-54-g00ecf