mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +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

6
src/openrct2-ui/windows/Error.cpp
View File

@@ -109,7 +109,7 @@ rct_window * window_error_open(rct_string_id title, rct_string_id message)
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
width = gfx_get_string_width_new_lined(_window_error_text);
width = Math::Min(196, width);
width = std::min(196, width);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gfx_wrap_string(_window_error_text, width + 1, &numLines, &fontHeight);
@@ -128,11 +128,11 @@ rct_window * window_error_open(rct_string_id title, rct_string_id message)
x = Math::Clamp(0, x, screenWidth);
y = state->y + 26;
y = Math::Max(22, y);
y = std::max(22, y);
maxY = screenHeight - height;
if (y > maxY) {
y = y - height - 40;
y = Math::Min(y, maxY);
y = std::min(y, maxY);
}
w = window_create(x, y, width, height, &window_error_events, WC_ERROR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_RESIZABLE);