mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 19:25:12 +01:00
Code Issues Releases Wiki Activity

Replace Math::Min and Max with std variants

Browse Source
This commit is contained in:
Michael Steenbeek
2018-06-20 17:11:35 +02:00
committed by GitHub
parent 323162cfe8
commit ec3a1e575e
72 changed files with 326 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/ClearScenery.cpp
View File

@@ -158,14 +158,14 @@ static void window_clear_scenery_mousedown(rct_window * w, rct_widgetindex widge
switch (widgetIndex) {
case WIDX_DECREMENT:
// Decrement land tool size, if it stays within the limit
gLandToolSize = Math::Max(MINIMUM_TOOL_SIZE, gLandToolSize - 1);
gLandToolSize = std::max(MINIMUM_TOOL_SIZE, gLandToolSize - 1);
// Invalidate the window
window_invalidate(w);
break;
case WIDX_INCREMENT:
// Increment land tool size, if it stays within the limit
gLandToolSize = Math::Min(MAXIMUM_TOOL_SIZE, gLandToolSize + 1);
gLandToolSize = std::min(MAXIMUM_TOOL_SIZE, gLandToolSize + 1);
// Invalidate the window
window_invalidate(w);
@@ -183,8 +183,8 @@ static void window_clear_scenery_textinput(rct_window *w, rct_widgetindex widget
size = strtol(text, &end, 10);
if (*end == '\0') {
size = Math::Max(MINIMUM_TOOL_SIZE, size);
size = Math::Min(MAXIMUM_TOOL_SIZE, size);
size = std::max(MINIMUM_TOOL_SIZE, size);
size = std::min(MAXIMUM_TOOL_SIZE, size);
gLandToolSize = size;
window_invalidate(w);
}