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/console_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/console_gui.cpp')
| -rw-r--r-- | src/console_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 3841a5954..c8ad5fbdb 100644 --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -194,7 +194,7 @@ struct IConsoleWindow : Window */ void Scroll(int amount) { - int max_scroll = max<int>(0, IConsoleLine::size + 1 - this->height / this->line_height); + int max_scroll = std::max(0, IConsoleLine::size + 1 - this->height / this->line_height); IConsoleWindow::scroll = Clamp<int>(IConsoleWindow::scroll + amount, 0, max_scroll); this->SetDirty(); } @@ -231,7 +231,7 @@ struct IConsoleWindow : Window { if (IConsoleLine::Truncate() && (IConsoleWindow::scroll > IConsoleLine::size)) { - IConsoleWindow::scroll = max(0, IConsoleLine::size - (this->height / this->line_height) + 1); + IConsoleWindow::scroll = std::max(0, IConsoleLine::size - (this->height / this->line_height) + 1); this->SetDirty(); } } @@ -341,7 +341,7 @@ struct IConsoleWindow : Window Point GetCaretPosition() const override { - int delta = min(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0); + int delta = std::min<int>(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0); Point pt = {this->line_offset + delta + _iconsole_cmdline.caretxoffs, this->height - this->line_height}; return pt; @@ -349,7 +349,7 @@ struct IConsoleWindow : Window Rect GetTextBoundingRect(const char *from, const char *to) const override { - int delta = min(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0); + int delta = std::min<int>(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0); Point p1 = GetCharPosInString(_iconsole_cmdline.buf, from, FS_NORMAL); Point p2 = from != to ? GetCharPosInString(_iconsole_cmdline.buf, from) : p1; @@ -360,7 +360,7 @@ struct IConsoleWindow : Window const char *GetTextCharacterAtPosition(const Point &pt) const override { - int delta = min(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0); + int delta = std::min<int>(this->width - this->line_offset - _iconsole_cmdline.pixels - ICON_RIGHT_BORDERWIDTH, 0); if (!IsInsideMM(pt.y, this->height - this->line_height, this->height)) return nullptr; |