diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 4bda383aec..4a04eac977 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -22,7 +22,7 @@ #include "TextComposition.h" #include -#include +#include #include #ifdef __MACOSX__ diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 9fdb92d96f..82780c4dd9 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include using namespace OpenRCT2; using namespace OpenRCT2::Drawing; diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp index 436f5e287c..9bcbb96f87 100644 --- a/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp +++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index eb59efc77c..cd9255dcf6 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 841a6fb7c2..6f4e55820d 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Dropdown.h b/src/openrct2-ui/interface/Dropdown.h index 703effa2f9..513a99c182 100644 --- a/src/openrct2-ui/interface/Dropdown.h +++ b/src/openrct2-ui/interface/Dropdown.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #define DROPDOWN_SEPARATOR 0 #define DROPDOWN_FORMAT_COLOUR_PICKER 0xFFFE diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index 0b9f49ed5e..ec9455dd72 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include static uint16 toolSizeSpriteIndices[] = { diff --git a/src/openrct2-ui/interface/LandTool.h b/src/openrct2-ui/interface/LandTool.h index 18210d414c..1d265c4210 100644 --- a/src/openrct2-ui/interface/LandTool.h +++ b/src/openrct2-ui/interface/LandTool.h @@ -18,7 +18,7 @@ #include #include -#include +#include #define MINIMUM_TOOL_SIZE 1 #define MAXIMUM_TOOL_SIZE 64 diff --git a/src/openrct2-ui/windows/ShortcutKeyChange.cpp b/src/openrct2-ui/windows/ShortcutKeyChange.cpp index c653379a42..f554fbe1cb 100644 --- a/src/openrct2-ui/windows/ShortcutKeyChange.cpp +++ b/src/openrct2-ui/windows/ShortcutKeyChange.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 6a673b2608..cd92be6490 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -18,7 +18,7 @@ #include -#include +#include #include typedef void (*loadsave_callback)(sint32 result, const utf8 * path); diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 7cf5670484..39d080924c 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -18,7 +18,7 @@ #include "config/Config.h" #include "Editor.h" #include "Game.h" -#include "interface/window.h" +#include "interface/Window.h" #include "localisation/Localisation.h" #include "management/Finance.h" #include "network/network.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 6fbdd5ff61..e7274a3c69 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -27,7 +27,7 @@ #include "interface/Screenshot.h" #include "interface/Viewport.h" #include "interface/Widget.h" -#include "interface/window.h" +#include "interface/Window.h" #include "localisation/Localisation.h" #include "management/Finance.h" #include "management/Marketing.h" diff --git a/src/openrct2/Input.h b/src/openrct2/Input.h index 96f9b2c54f..c8bcfcb743 100644 --- a/src/openrct2/Input.h +++ b/src/openrct2/Input.h @@ -17,7 +17,7 @@ #ifndef _INPUT_H_ #define _INPUT_H_ -#include "interface/window.h" +#include "interface/Window.h" typedef enum INPUT_FLAGS { INPUT_FLAG_WIDGET_PRESSED = (1 << 0), diff --git a/src/openrct2/actions/GuestSetNameAction.hpp b/src/openrct2/actions/GuestSetNameAction.hpp index a3abd5a376..9b4365a5c9 100644 --- a/src/openrct2/actions/GuestSetNameAction.hpp +++ b/src/openrct2/actions/GuestSetNameAction.hpp @@ -21,7 +21,7 @@ #include "GameAction.h" #include "../Cheats.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp index 5b8953179a..9e637259d1 100644 --- a/src/openrct2/actions/RideCreateAction.hpp +++ b/src/openrct2/actions/RideCreateAction.hpp @@ -23,7 +23,7 @@ #include "../localisation/Date.h" #include "../Cheats.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../world/Park.h" #include "../rct1.h" #include "../ride/ride_data.h" diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index ea0c244f07..f40a4b4c08 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -19,7 +19,7 @@ #include "../Cheats.h" #include "../Context.h" #include "../core/MemoryStream.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp index 363c2d28a9..b83df58b16 100644 --- a/src/openrct2/actions/RideSetName.hpp +++ b/src/openrct2/actions/RideSetName.hpp @@ -19,7 +19,7 @@ #include "../Cheats.h" #include "../Context.h" #include "../core/MemoryStream.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" #include "../ui/UiContext.h" diff --git a/src/openrct2/actions/RideSetStatus.hpp b/src/openrct2/actions/RideSetStatus.hpp index 5cf30a8ad3..76c9e33e6b 100644 --- a/src/openrct2/actions/RideSetStatus.hpp +++ b/src/openrct2/actions/RideSetStatus.hpp @@ -21,7 +21,7 @@ #include "GameAction.h" #include "../Cheats.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../world/Park.h" #include "../ride/Ride.h" diff --git a/src/openrct2/actions/SetParkEntranceFeeAction.hpp b/src/openrct2/actions/SetParkEntranceFeeAction.hpp index d9a47c20f6..3c9754ec9e 100644 --- a/src/openrct2/actions/SetParkEntranceFeeAction.hpp +++ b/src/openrct2/actions/SetParkEntranceFeeAction.hpp @@ -21,7 +21,7 @@ #include "GameAction.h" #include "../Cheats.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../world/Park.h" struct SetParkEntranceFeeAction : public GameActionBase diff --git a/src/openrct2/actions/StaffSetNameAction.hpp b/src/openrct2/actions/StaffSetNameAction.hpp index 82c29261cd..9363464686 100644 --- a/src/openrct2/actions/StaffSetNameAction.hpp +++ b/src/openrct2/actions/StaffSetNameAction.hpp @@ -22,7 +22,7 @@ #include "../Cheats.h" #include "../peep/Staff.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../world/Park.h" diff --git a/src/openrct2/cmdline/ConvertCommand.cpp b/src/openrct2/cmdline/ConvertCommand.cpp index a246af1794..cd548183ba 100644 --- a/src/openrct2/cmdline/ConvertCommand.cpp +++ b/src/openrct2/cmdline/ConvertCommand.cpp @@ -25,7 +25,7 @@ #include "CommandLine.hpp" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../OpenRCT2.h" static void WriteConvertFromAndToMessage(uint32 sourceFileType, uint32 destinationFileType); diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index f7f6a9521e..8e9b711578 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -23,7 +23,7 @@ #include "../core/Path.hpp" #include "../core/String.hpp" #include "../drawing/IDrawingEngine.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../network/network.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 0f03f56435..1382b17c27 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -17,7 +17,7 @@ #include "../common.h" #include "../Context.h" #include "../core/Guard.hpp" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../object/Object.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 985ad8956b..4efae1c35f 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -22,7 +22,7 @@ #include "../config/Config.h" #include "../Game.h" #include "../interface/Viewport.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../paint/tile_element/TileElement.h" #include "../util/Util.h" #include "../world/Climate.h" diff --git a/src/openrct2/drawing/Rain.cpp b/src/openrct2/drawing/Rain.cpp index 10a5f62f0f..978357b730 100644 --- a/src/openrct2/drawing/Rain.cpp +++ b/src/openrct2/drawing/Rain.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../interface/window.h" +#include "../interface/Window.h" #include "../world/Climate.h" #include "Drawing.h" #include "../config/Config.h" diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index e9b9b281e2..21d6790ecf 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -28,7 +28,7 @@ #include "../Game.h" #include "../interface/Viewport.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../Intro.h" #include "Drawing.h" #include "LightFX.h" diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index 614a0e2fd2..f424d1842e 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -24,7 +24,7 @@ #include "../config/Config.h" #include "../platform/platform.h" #include "themes.h" -#include "window.h" +#include "Window.h" #include "../core/Json.hpp" #include "../core/Math.hpp" diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index 0f54ab81dc..bd13c780dc 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -37,7 +37,7 @@ #include "../world/sprite.h" #include "Colour.h" #include "Viewport.h" -#include "window.h" +#include "Window.h" extern "C" { diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index ea76d03abc..b005caebb2 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -20,7 +20,7 @@ #include "../world/Map.h" #include "../world/sprite.h" #include "../paint/Paint.h" -#include "window.h" +#include "Window.h" enum { VIEWPORT_FLAG_UNDERGROUND_INSIDE = (1 << 0), diff --git a/src/openrct2/interface/Widget.cpp b/src/openrct2/interface/Widget.cpp index 78e3691b02..c836e44b9a 100644 --- a/src/openrct2/interface/Widget.cpp +++ b/src/openrct2/interface/Widget.cpp @@ -24,7 +24,7 @@ #include "../util/Util.h" #include "../Context.h" #include "Widget.h" -#include "window.h" +#include "Window.h" static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex); static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIndex); diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index 687a7aaf81..f81d6a68c1 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -17,7 +17,7 @@ #ifndef _WIDGET_H_ #define _WIDGET_H_ -#include "window.h" +#include "Window.h" typedef enum { WWT_EMPTY = 0, diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/Window.cpp similarity index 97% rename from src/openrct2/interface/window.c rename to src/openrct2/interface/Window.cpp index e91d08e117..b7945c00b9 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/Window.cpp @@ -14,10 +14,13 @@ *****************************************************************************/ #pragma endregion +#include #include "../audio/audio.h" #include "../config/Config.h" #include "../Context.h" #include "../core/Guard.hpp" +#include "../core/Math.hpp" +#include "../core/Util.hpp" #include "../drawing/Drawing.h" #include "../Editor.h" #include "../Game.h" @@ -32,7 +35,10 @@ #include "../world/sprite.h" #include "Viewport.h" #include "Widget.h" -#include "window.h" +#include "Window.h" + +extern "C" +{ #define RCT2_FIRST_WINDOW (g_window_list) #define RCT2_LAST_WINDOW (gWindowNextSlot - 1) @@ -115,22 +121,6 @@ static sint32 window_get_scroll_index(rct_window *w, sint32 targetWidgetIndex) return scrollIndex; } -static sint32 window_get_scroll_index_from_widget(rct_window *w, rct_widget *widget) -{ - if (widget->type != WWT_SCROLL) - return -1; - - sint32 scrollIndex = 0; - for (rct_widget *widget2 = w->widgets; widget2->type != WWT_LAST; widget2++) { - if (widget2 == widget) - break; - if (widget2->type == WWT_SCROLL) - scrollIndex++; - } - - return scrollIndex; -} - static rct_widget *window_get_scroll_widget(rct_window *w, sint32 scrollIndex) { for (rct_widget *widget = w->widgets; widget->type != WWT_LAST; widget++) { @@ -207,14 +197,14 @@ static void window_scroll_wheel_input(rct_window *w, sint32 scrollIndex, sint32 sint32 size = widget->bottom - widget->top - 1; if (scroll->flags & HSCROLLBAR_VISIBLE) size -= 11; - size = max(0, scroll->v_bottom - size); - scroll->v_top = min(max(0, scroll->v_top + wheel), size); + size = std::max(0, scroll->v_bottom - size); + scroll->v_top = std::min(std::max(0, scroll->v_top + wheel), size); } else { sint32 size = widget->right - widget->left - 1; if (scroll->flags & VSCROLLBAR_VISIBLE) size -= 11; - size = max(0, scroll->h_right - size); - scroll->h_left = min(max(0, scroll->h_left + wheel), size); + size = std::max(0, scroll->h_right - size); + scroll->h_left = std::min(std::max(0, scroll->h_left + wheel), size); } widget_scroll_update_thumbs(w, widgetIndex); @@ -381,7 +371,7 @@ static void window_close_surplus(sint32 cap, sint8 avoid_classification) void window_set_window_limit(sint32 value) { sint32 prev = gConfigGeneral.window_limit; - sint32 val = clamp(WINDOW_LIMIT_MIN, value, WINDOW_LIMIT_MAX); + sint32 val = Math::Clamp(WINDOW_LIMIT_MIN, value, WINDOW_LIMIT_MAX); gConfigGeneral.window_limit = val; config_save_default(); // Checks if value decreases and then closes surplus @@ -687,7 +677,7 @@ rct_window * window_create_centred(sint32 width, sint32 height, rct_window_event sint32 screenHeight = context_get_height(); sint32 x = (screenWidth - width) / 2; - sint32 y = max(TOP_TOOLBAR_HEIGHT + 1, (screenHeight - height) / 2); + sint32 y = std::max(TOP_TOOLBAR_HEIGHT + 1, (screenHeight - height) / 2); return window_create(x, y, width, height, event_handlers, cls, flags); } @@ -1354,9 +1344,9 @@ void window_set_location(rct_window *w, sint32 x, sint32 y, sint32 z) void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z) { LocationXYZ16 location_3d = { - .x = x, - .y = y, - .z = z + /* .x = */ (sint16)x, + /* .y = */ (sint16)y, + /* .z = */ (sint16)z }; assert(w != NULL); @@ -1403,7 +1393,7 @@ void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z) } } } - if (i >= countof(window_scroll_locations)) { + if (i >= (sint32)Util::CountOf(window_scroll_locations)) { i = 0; found = 1; } @@ -1528,7 +1518,7 @@ void window_zoom_set(rct_window *w, sint32 zoomLevel, bool atCursor) { rct_viewport* v = w->viewport; - zoomLevel = clamp(0, zoomLevel, MAX_ZOOM_LEVEL); + zoomLevel = Math::Clamp(0, zoomLevel, MAX_ZOOM_LEVEL); if (v->zoom == zoomLevel) return; @@ -1617,10 +1607,10 @@ void window_draw(rct_drawpixelinfo *dpi, rct_window *w, sint32 left, sint32 top, return; // Clamp region - left = max(left, w->x); - top = max(top, w->y); - right = min(right, w->x + w->width); - bottom = min(bottom, w->y + w->height); + left = std::max(left, w->x); + top = std::max(top, w->y); + right = std::min(right, w->x + w->width); + bottom = std::min(bottom, w->y + w->height); if (left >= right) return; if (top >= bottom) return; @@ -1816,8 +1806,8 @@ void window_resize(rct_window *w, sint32 dw, sint32 dh) window_invalidate(w); // Clamp new size to minimum and maximum - w->width = clamp(w->min_width, w->width + dw, w->max_width); - w->height = clamp(w->min_height, w->height + dh, w->max_height); + w->width = Math::Clamp(w->min_width, w->width + dw, w->max_width); + w->height = Math::Clamp(w->min_height, w->height + dh, w->max_height); window_event_resize_call(w); window_event_invalidate_call(w); @@ -1841,8 +1831,8 @@ void window_set_resize(rct_window *w, sint32 minWidth, sint32 minHeight, sint32 w->max_height = maxHeight; // Clamp width and height to minimum and maximum - sint32 width = clamp(minWidth, w->width, maxWidth); - sint32 height = clamp(minHeight, w->height, maxHeight); + sint32 width = Math::Clamp(minWidth, w->width, maxWidth); + sint32 height = Math::Clamp(minHeight, w->height, maxHeight); // Resize window if size has changed if (w->width != width || w->height != height) { @@ -2164,13 +2154,13 @@ void window_resize_gui(sint32 width, sint32 height) rct_window *topWind = window_find_by_class(WC_TOP_TOOLBAR); if (topWind != NULL) { - topWind->width = max(640, width); + topWind->width = std::max(640, width); } rct_window *bottomWind = window_find_by_class(WC_BOTTOM_TOOLBAR); if (bottomWind != NULL) { bottomWind->y = height - 32; - bottomWind->width = max(640, width); + bottomWind->width = std::max(640, width); } rct_window *titleWind = window_find_by_class(WC_TITLE_MENU); @@ -2215,13 +2205,13 @@ void window_resize_gui_scenario_editor(sint32 width, sint32 height) rct_window *topWind = window_find_by_class(WC_TOP_TOOLBAR); if (topWind != NULL) { - topWind->width = max(640, width); + topWind->width = std::max(640, width); } rct_window *bottomWind = window_find_by_class(WC_BOTTOM_TOOLBAR); if (bottomWind != NULL) { bottomWind->y = height - 32; - bottomWind->width = max(640, width); + bottomWind->width = std::max(640, width); } } @@ -2343,11 +2333,11 @@ static void window_snap_left(rct_window *w, sint32 proximity) if (right < wLeftProximity || right > wRightProximity) continue; - rightMost = max(rightMost, right); + rightMost = std::max(rightMost, right); } if (0 >= wLeftProximity && 0 <= wRightProximity) - rightMost = max(rightMost, 0); + rightMost = std::max(rightMost, 0); if (rightMost != INT32_MIN) w->x = rightMost; @@ -2376,11 +2366,11 @@ static void window_snap_top(rct_window *w, sint32 proximity) if (bottom < wTopProximity || bottom > wBottomProximity) continue; - bottomMost = max(bottomMost, bottom); + bottomMost = std::max(bottomMost, bottom); } if (0 >= wTopProximity && 0 <= wBottomProximity) - bottomMost = max(bottomMost, 0); + bottomMost = std::max(bottomMost, 0); if (bottomMost != INT32_MIN) w->y = bottomMost; @@ -2408,12 +2398,12 @@ static void window_snap_right(rct_window *w, sint32 proximity) if (w2->x < wLeftProximity || w2->x > wRightProximity) continue; - leftMost = min(leftMost, w2->x); + leftMost = std::min(leftMost, w2->x); } screenWidth = context_get_width(); if (screenWidth >= wLeftProximity && screenWidth <= wRightProximity) - leftMost = min(leftMost, screenWidth); + leftMost = std::min(leftMost, screenWidth); if (leftMost != INT32_MAX) w->x = leftMost - w->width; @@ -2441,12 +2431,12 @@ static void window_snap_bottom(rct_window *w, sint32 proximity) if (w2->y < wTopProximity || w2->y > wBottomProximity) continue; - topMost = min(topMost, w2->y); + topMost = std::min(topMost, w2->y); } screenHeight = context_get_height(); if (screenHeight >= wTopProximity && screenHeight <= wBottomProximity) - topMost = min(topMost, screenHeight); + topMost = std::min(topMost, screenHeight); if (topMost != INT32_MAX) w->y = topMost - w->height; @@ -2458,7 +2448,7 @@ void window_move_and_snap(rct_window *w, sint32 newWindowX, sint32 newWindowY, s sint32 originalY = w->y; sint32 minY = (gScreenFlags & SCREEN_FLAGS_TITLE_DEMO) ? 1 : TOP_TOOLBAR_HEIGHT + 2; - newWindowY = clamp(minY, newWindowY, context_get_height() - 34); + newWindowY = Math::Clamp(minY, newWindowY, context_get_height() - 34); if (snapProximity > 0) { w->x = newWindowX; @@ -2701,3 +2691,5 @@ void window_unfollow_sprite(rct_window * w) w->viewport_smart_follow_sprite = SPRITE_INDEX_NULL; w->viewport_target_sprite = SPRITE_INDEX_NULL; } + +} diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/Window.h similarity index 100% rename from src/openrct2/interface/window.h rename to src/openrct2/interface/Window.h diff --git a/src/openrct2/interface/themes.h b/src/openrct2/interface/themes.h index ebb49e2d22..ecde7ef7f0 100644 --- a/src/openrct2/interface/themes.h +++ b/src/openrct2/interface/themes.h @@ -18,7 +18,7 @@ #define _THEMES_H_ #include "../common.h" -#include "window.h" +#include "Window.h" enum { UITHEME_FLAG_PREDEFINED = 1 << 0, diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 1293fffd44..6bf70be678 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -16,7 +16,7 @@ #include "../config/Config.h" #include "../core/Util.hpp" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/StringIds.h" #include "../peep/Peep.h" #include "../ride/Ride.h" diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp index 7fdb3da041..1a1302d8b9 100644 --- a/src/openrct2/management/Finance.cpp +++ b/src/openrct2/management/Finance.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../peep/Peep.h" diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp index 0040534196..f13ef74503 100644 --- a/src/openrct2/management/Marketing.cpp +++ b/src/openrct2/management/Marketing.cpp @@ -17,7 +17,7 @@ #include "../config/Config.h" #include "../core/Util.hpp" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ride/ride_data.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 9c6d17adde..87639f587c 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -18,7 +18,7 @@ #include "../Context.h" #include "../core/Util.hpp" #include "../Input.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 0cb1d02e1e..3f61904ebb 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -18,7 +18,7 @@ #include "../core/Guard.hpp" #include "../core/Util.hpp" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 78e03b2b14..c76017d683 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -58,7 +58,7 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL; #include "../config/Config.h" #include "../Game.h" #include "../interface/Chat.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/network/NetworkPlayer.cpp b/src/openrct2/network/NetworkPlayer.cpp index d1d865c84c..9ad99410a6 100644 --- a/src/openrct2/network/NetworkPlayer.cpp +++ b/src/openrct2/network/NetworkPlayer.cpp @@ -19,7 +19,7 @@ #include "NetworkPacket.h" #include "NetworkPlayer.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" void NetworkPlayer::SetName(const std::string &name) diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index 9a2558e40a..b4b98ea72b 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -26,7 +26,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../Input.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" #include "../management/Marketing.h" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index f8f950bf80..8162fd6a15 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -38,7 +38,7 @@ #include "../Cheats.h" #include "../Editor.h" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 802af001ba..5a35fc8b4e 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -29,7 +29,7 @@ #include "../config/Config.h" #include "../Game.h" #include "../interface/Viewport.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 64742e4fe9..d9a2abfaa2 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -26,7 +26,7 @@ #include "../Editor.h" #include "../Game.h" #include "../Input.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index e28d7cea50..4834fbbc4e 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -17,7 +17,7 @@ #include "../../core/Math.hpp" #include "../../drawing/Drawing.h" #include "../../interface/Viewport.h" -#include "../../interface/window.h" +#include "../../interface/Window.h" #include "../../localisation/Localisation.h" #include "../../paint/Paint.h" #include "../../paint/Supports.h" diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index bf77e01411..86a64b6755 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -15,7 +15,7 @@ #pragma endregion #include "../Cheats.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../OpenRCT2.h" #include "../world/footpath.h" diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index 54dd56a1ab..0843d59e26 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -19,7 +19,7 @@ #include "../paint/Supports.h" #include "../interface/Viewport.h" #include "../paint/Paint.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../sprites.h" #include "../world/Map.h" diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index 02479b0a24..1c322a4dd7 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -31,7 +31,7 @@ #include "../Game.h" #include "../Input.h" #include "../interface/Viewport.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" // TODO Remove when no longer required. diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index 9ad90142b7..29fdf586fe 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -33,7 +33,7 @@ #include "../Game.h" #include "../interface/Viewport.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../management/NewsItem.h" #include "../windows/Intent.h" #include "../world/scenery.h" diff --git a/src/openrct2/ui/WindowManager.h b/src/openrct2/ui/WindowManager.h index 08cedfb379..a0c63db609 100644 --- a/src/openrct2/ui/WindowManager.h +++ b/src/openrct2/ui/WindowManager.h @@ -22,7 +22,7 @@ #include "../windows/Intent.h" #include "../common.h" -#include "../interface/window.h" +#include "../interface/Window.h" namespace OpenRCT2 { diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp index bc0007dd68..9f680cc52a 100644 --- a/src/openrct2/util/Util.cpp +++ b/src/openrct2/util/Util.cpp @@ -19,7 +19,7 @@ #include "../common.h" #include "../core/Guard.hpp" #include "../core/Math.hpp" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../platform/platform.h" #include "../title/TitleScreen.h" diff --git a/src/openrct2/windows/Intent.h b/src/openrct2/windows/Intent.h index f436052964..c9e4a398e6 100644 --- a/src/openrct2/windows/Intent.h +++ b/src/openrct2/windows/Intent.h @@ -2,7 +2,7 @@ #define OPENRCT2_INTENT_H #include "../common.h" -#include "../interface/window.h" +#include "../interface/Window.h" #ifdef __cplusplus #include #include diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c index 96b5fbce5f..ab1dfda501 100644 --- a/src/openrct2/windows/_legacy.c +++ b/src/openrct2/windows/_legacy.c @@ -15,7 +15,7 @@ #pragma endregion #include "_legacy.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../peep/Staff.h" #include "Intent.h" #include "../Context.h" diff --git a/src/openrct2/windows/tile_inspector.h b/src/openrct2/windows/tile_inspector.h index 167e5be24a..a074f63f78 100644 --- a/src/openrct2/windows/tile_inspector.h +++ b/src/openrct2/windows/tile_inspector.h @@ -17,7 +17,7 @@ #pragma once #include "../common.h" -#include "../interface/window.h" +#include "../interface/Window.h" typedef enum tile_inspector_page { diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index d6412e8ce9..60278851ea 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -27,7 +27,7 @@ #include "Park.h" #include "scenery.h" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../ride/Ride.h" #include "../ride/Track.h" diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 0edcef3c3f..1a9388e092 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -24,7 +24,7 @@ #include "../Cheats.h" #include "../drawing/Drawing.h" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../scenario/Scenario.h" #include "../sprites.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 821cbfa8de..84467c6f54 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -22,7 +22,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../interface/Cursors.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/Localisation.h" #include "../management/Finance.h" diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp index 34129f0bec..03a1c25a8b 100644 --- a/src/openrct2/world/MoneyEffect.cpp +++ b/src/openrct2/world/MoneyEffect.cpp @@ -16,7 +16,7 @@ #include "../localisation/Localisation.h" #include "../interface/Viewport.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../OpenRCT2.h" #include "sprite.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 971702fdcb..1b8cd6a5b4 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -21,7 +21,7 @@ #include "../core/Util.hpp" #include "../Game.h" #include "../interface/Colour.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../localisation/Localisation.h" #include "../management/Award.h" #include "../management/Finance.h" diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index 0d64380339..2a1bb0295e 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -18,7 +18,7 @@ #include "../Context.h" #include "../core/Guard.hpp" #include "../Game.h" -#include "../interface/window.h" +#include "../interface/Window.h" #include "../ride/Track.h" #include "../windows/Intent.h" #include "../windows/tile_inspector.h"