From 59054bdeaa355f97f3aecc8e67438c4fb25b4145 Mon Sep 17 00:00:00 2001 From: pizza2004 Date: Mon, 2 Nov 2020 18:14:00 -0700 Subject: [PATCH] Refactor Widget to TitleCase --- src/openrct2-ui/input/KeyboardShortcut.cpp | 38 +-- src/openrct2-ui/input/MouseInput.cpp | 26 +- src/openrct2-ui/interface/Widget.cpp | 172 +++++++------ src/openrct2-ui/interface/Window.cpp | 10 +- src/openrct2-ui/scripting/CustomWindow.cpp | 6 +- src/openrct2-ui/scripting/ScWidget.hpp | 10 +- src/openrct2-ui/windows/Cheats.cpp | 44 ++-- src/openrct2-ui/windows/DebugPaint.cpp | 10 +- .../windows/EditorInventionsList.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/Land.cpp | 4 +- src/openrct2-ui/windows/Map.cpp | 8 +- src/openrct2-ui/windows/MapGen.cpp | 60 ++--- src/openrct2-ui/windows/MazeConstruction.cpp | 4 +- src/openrct2-ui/windows/Multiplayer.cpp | 8 +- src/openrct2-ui/windows/Network.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/NewsOptions.cpp | 2 +- src/openrct2-ui/windows/ObjectLoadError.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 93 ++++--- src/openrct2-ui/windows/Park.cpp | 4 +- src/openrct2-ui/windows/Player.cpp | 6 +- src/openrct2-ui/windows/Ride.cpp | 14 +- src/openrct2-ui/windows/RideConstruction.cpp | 240 +++++++++--------- src/openrct2-ui/windows/RideList.cpp | 4 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/ServerStart.cpp | 2 +- src/openrct2-ui/windows/Themes.cpp | 8 +- src/openrct2-ui/windows/TileInspector.cpp | 102 ++++---- src/openrct2-ui/windows/TitleEditor.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 18 +- src/openrct2-ui/windows/ViewClipping.cpp | 4 +- src/openrct2/interface/Widget.h | 22 +- src/openrct2/interface/Window.cpp | 4 +- 36 files changed, 465 insertions(+), 476 deletions(-) diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index f35668543bfc..6642e1da80f9 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -162,7 +162,7 @@ static void ShortcutRotateConstructionObject() // Rotate scenery rct_window* w = window_find_by_class(WC_SCENERY); - if (w != nullptr && !widget_is_disabled(w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) + if (w != nullptr && !WidgetIsDisabled(w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) && w->widgets[WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON); @@ -171,7 +171,7 @@ static void ShortcutRotateConstructionObject() // Rotate construction track piece w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w != nullptr && !widget_is_disabled(w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) + if (w != nullptr && !WidgetIsDisabled(w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) && w->widgets[WC_RIDE_CONSTRUCTION__WIDX_ROTATE].type != WWT_EMPTY) { // Check if building a maze... @@ -184,7 +184,7 @@ static void ShortcutRotateConstructionObject() // Rotate track design preview w = window_find_by_class(WC_TRACK_DESIGN_LIST); - if (w != nullptr && !widget_is_disabled(w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE) && w->widgets[WC_TRACK_DESIGN_LIST__WIDX_ROTATE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TRACK_DESIGN_LIST__WIDX_ROTATE); @@ -193,7 +193,7 @@ static void ShortcutRotateConstructionObject() // Rotate track design placement w = window_find_by_class(WC_TRACK_DESIGN_PLACE); - if (w != nullptr && !widget_is_disabled(w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE) && w->widgets[WC_TRACK_DESIGN_PLACE__WIDX_ROTATE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TRACK_DESIGN_PLACE__WIDX_ROTATE); @@ -202,7 +202,7 @@ static void ShortcutRotateConstructionObject() // Rotate park entrance w = window_find_by_class(WC_MAP); - if (w != nullptr && !widget_is_disabled(w, WC_MAP__WIDX_ROTATE_90) && w->widgets[WC_MAP__WIDX_ROTATE_90].type != WWT_EMPTY) + if (w != nullptr && !WidgetIsDisabled(w, WC_MAP__WIDX_ROTATE_90) && w->widgets[WC_MAP__WIDX_ROTATE_90].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_MAP__WIDX_ROTATE_90); return; @@ -210,7 +210,7 @@ static void ShortcutRotateConstructionObject() // Rotate selected element in tile inspector w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE); @@ -801,7 +801,7 @@ static void ShortcutOpenSceneryPicker() } window_scenery = window_find_by_class(WC_SCENERY); - if (window_scenery != nullptr && !widget_is_disabled(window_scenery, WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON) + if (window_scenery != nullptr && !WidgetIsDisabled(window_scenery, WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON) && window_scenery->widgets[WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON].type != WWT_EMPTY && !gWindowSceneryEyedropperEnabled) { @@ -833,7 +833,7 @@ static void ShortcutScaleDown() static void ShortcutInsertCorruptElement() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_CORRUPT) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_CORRUPT) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_CORRUPT].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_CORRUPT); @@ -844,7 +844,7 @@ static void ShortcutInsertCorruptElement() static void ShortcutCopyElement() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_COPY) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_COPY) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_COPY].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_COPY); @@ -855,7 +855,7 @@ static void ShortcutCopyElement() static void ShortcutPasteElement() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_PASTE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_PASTE) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_PASTE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_PASTE); @@ -866,7 +866,7 @@ static void ShortcutPasteElement() static void ShortcutRemoveElement() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_REMOVE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_REMOVE) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_REMOVE].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_REMOVE); @@ -877,7 +877,7 @@ static void ShortcutRemoveElement() static void ShortcutMoveElementUp() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_UP) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_UP) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_UP].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_UP); @@ -888,7 +888,7 @@ static void ShortcutMoveElementUp() static void ShortcutMoveElementDown() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_DOWN) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_DOWN) && w->widgets[WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_DOWN].type != WWT_EMPTY) { window_event_mouse_up_call(w, WC_TILE_INSPECTOR__WIDX_BUTTON_MOVE_DOWN); @@ -899,7 +899,7 @@ static void ShortcutMoveElementDown() static void ShortcutIncreaseXCoord() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_X_INCREASE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_X_INCREASE) && w->widgets[WC_TILE_INSPECTOR__WIDX_SPINNER_X_INCREASE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WC_TILE_INSPECTOR__WIDX_SPINNER_X_INCREASE); @@ -910,7 +910,7 @@ static void ShortcutIncreaseXCoord() static void ShortcutDecreaseXCoord() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE) && w->widgets[WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WC_TILE_INSPECTOR__WIDX_SPINNER_X_DECREASE); @@ -921,7 +921,7 @@ static void ShortcutDecreaseXCoord() static void ShortcutIncreaseYCoord() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE) && w->widgets[WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_INCREASE); @@ -932,7 +932,7 @@ static void ShortcutIncreaseYCoord() static void ShortcutDecreaseYCoord() { rct_window* w = window_find_by_class(WC_TILE_INSPECTOR); - if (w != nullptr && !widget_is_disabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE) + if (w != nullptr && !WidgetIsDisabled(w, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE) && w->widgets[WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WC_TILE_INSPECTOR__WIDX_SPINNER_Y_DECREASE); @@ -976,7 +976,7 @@ static void ShortcutIncreaseElementHeight() action = WC_TILE_INSPECTOR__WIDX_CORRUPT_SPINNER_HEIGHT_INCREASE; break; } - if (action != -1 && !widget_is_disabled(w, action) && w->widgets[action].type != WWT_EMPTY) + if (action != -1 && !WidgetIsDisabled(w, action) && w->widgets[action].type != WWT_EMPTY) window_event_mouse_down_call(w, action); return; } @@ -1018,7 +1018,7 @@ static void ShortcutDecreaseElementHeight() action = WC_TILE_INSPECTOR__WIDX_CORRUPT_SPINNER_HEIGHT_DECREASE; break; } - if (action != -1 && !widget_is_disabled(w, action) && w->widgets[action].type != WWT_EMPTY) + if (action != -1 && !WidgetIsDisabled(w, action) && w->widgets[action].type != WWT_EMPTY) window_event_mouse_down_call(w, action); return; } diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 09cdcc0b7377..a514ae198568 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -222,7 +222,7 @@ static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, rct_wind scroll->v_top = std::min(std::max(0, scroll->v_top + differentialCoords.y), size); } - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); window_invalidate_by_number(w->classification, w->number); ScreenCoordsXY fixedCursorPosition = { static_cast(std::ceil(gInputDragLast.x * gConfigGeneral.window_scale)), @@ -601,7 +601,7 @@ static void InputScrollBegin(rct_window* w, rct_widgetindex widgetIndex, const S int32_t scroll_area, scroll_id; ScreenCoordsXY scrollCoords; scroll_id = 0; // safety - widget_scroll_get_part(w, widget, screenCoords, scrollCoords, &scroll_area, &scroll_id); + WidgetScrollGetPart(w, widget, screenCoords, scrollCoords, &scroll_area, &scroll_id); _currentScrollArea = scroll_area; _currentScrollIndex = scroll_id; @@ -654,7 +654,7 @@ static void InputScrollBegin(rct_window* w, rct_widgetindex widgetIndex, const S default: break; } - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); window_invalidate_by_number(widgetIndex, w->classification); } @@ -674,7 +674,7 @@ static void InputScrollContinue(rct_window* w, rct_widgetindex widgetIndex, cons } ScreenCoordsXY newScreenCoords; - widget_scroll_get_part(w, widget, screenCoords, newScreenCoords, &scroll_part, &scroll_id); + WidgetScrollGetPart(w, widget, screenCoords, newScreenCoords, &scroll_part, &scroll_id); if (_currentScrollArea == SCROLL_PART_HSCROLLBAR_THUMB) { @@ -757,7 +757,7 @@ static void InputScrollPartUpdateHThumb(rct_window* w, rct_widgetindex widgetInd if (newLeft > x) newLeft = x; w->scrolls[scroll_id].h_left = newLeft; - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate_by_number(w->classification, w->number, widgetIndex); } } @@ -796,7 +796,7 @@ static void InputScrollPartUpdateVThumb(rct_window* w, rct_widgetindex widgetInd if (newTop > y) newTop = y; w->scrolls[scroll_id].v_top = newTop; - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate_by_number(w->classification, w->number, widgetIndex); } } @@ -813,7 +813,7 @@ static void InputScrollPartUpdateHLeft(rct_window* w, rct_widgetindex widgetInde w->scrolls[scroll_id].flags |= HSCROLLBAR_LEFT_PRESSED; if (w->scrolls[scroll_id].h_left >= 3) w->scrolls[scroll_id].h_left -= 3; - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate_by_number(w->classification, w->number, widgetIndex); } } @@ -839,7 +839,7 @@ static void InputScrollPartUpdateHRight(rct_window* w, rct_widgetindex widgetInd newLeft = 0; if (w->scrolls[scroll_id].h_left > newLeft) w->scrolls[scroll_id].h_left = newLeft; - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate_by_number(w->classification, w->number, widgetIndex); } } @@ -856,7 +856,7 @@ static void InputScrollPartUpdateVTop(rct_window* w, rct_widgetindex widgetIndex w->scrolls[scroll_id].flags |= VSCROLLBAR_UP_PRESSED; if (w->scrolls[scroll_id].v_top >= 3) w->scrolls[scroll_id].v_top -= 3; - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate_by_number(w->classification, w->number, widgetIndex); } } @@ -882,7 +882,7 @@ static void InputScrollPartUpdateVBottom(rct_window* w, rct_widgetindex widgetIn newTop = 0; if (w->scrolls[scroll_id].v_top > newTop) w->scrolls[scroll_id].v_top = newTop; - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate_by_number(w->classification, w->number, widgetIndex); } } @@ -914,7 +914,7 @@ static void InputWidgetOver(const ScreenCoordsXY& screenCoords, rct_window* w, r { int32_t scroll_part, scrollId; ScreenCoordsXY newScreenCoords; - widget_scroll_get_part(w, widget, screenCoords, newScreenCoords, &scroll_part, &scrollId); + WidgetScrollGetPart(w, widget, screenCoords, newScreenCoords, &scroll_part, &scrollId); if (scroll_part != SCROLL_PART_VIEW) window_tooltip_close(); @@ -1042,7 +1042,7 @@ static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, r InputScrollBegin(w, widgetIndex, screenCoords); break; default: - if (widget_is_enabled(w, widgetIndex) && !widget_is_disabled(w, widgetIndex)) + if (WidgetIsEnabled(w, widgetIndex) && !WidgetIsDisabled(w, widgetIndex)) { OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + widget->midX()); @@ -1118,7 +1118,7 @@ void ProcessMouseOver(const ScreenCoordsXY& screenCoords) { int32_t output_scroll_area, scroll_id; ScreenCoordsXY scrollCoords; - widget_scroll_get_part( + WidgetScrollGetPart( window, &window->widgets[widgetId], screenCoords, scrollCoords, &output_scroll_area, &scroll_id); if (output_scroll_area != SCROLL_PART_VIEW) { diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 3f4dd492ba0c..38506193127b 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -20,88 +20,88 @@ #include #include -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); -static void widget_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_flat_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_text_button(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_text_centred(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_text(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_text_inset(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_text_box_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_groupbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_caption_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_checkbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_closebox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_scroll_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -static void widget_hscrollbar_draw( +static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetText(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetScrollDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetHScrollbarDraw( rct_drawpixelinfo* dpi, rct_scroll* scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour); -static void widget_vscrollbar_draw( +static void WidgetVScrollbarDraw( rct_drawpixelinfo* dpi, rct_scroll* scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour); -static void widget_draw_image(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); +static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); /** * * rct2: 0x006EB2A8 */ -void widget_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +void WidgetDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { switch (w->widgets[widgetIndex].type) { case WWT_EMPTY: break; case WWT_FRAME: - widget_frame_draw(dpi, w, widgetIndex); + WidgetFrameDraw(dpi, w, widgetIndex); break; case WWT_RESIZE: - widget_resize_draw(dpi, w, widgetIndex); + WidgetResizeDraw(dpi, w, widgetIndex); break; case WWT_IMGBTN: - widget_button_draw(dpi, w, widgetIndex); + WidgetButtonDraw(dpi, w, widgetIndex); break; case WWT_COLOURBTN: case WWT_TRNBTN: case WWT_TAB: - widget_tab_draw(dpi, w, widgetIndex); + WidgetTabDraw(dpi, w, widgetIndex); break; case WWT_FLATBTN: - widget_flat_button_draw(dpi, w, widgetIndex); + WidgetFlatButtonDraw(dpi, w, widgetIndex); break; case WWT_BUTTON: case WWT_TABLE_HEADER: - widget_text_button(dpi, w, widgetIndex); + WidgetTextButton(dpi, w, widgetIndex); break; case WWT_LABEL_CENTRED: - widget_text_centred(dpi, w, widgetIndex); + WidgetTextCentred(dpi, w, widgetIndex); break; case WWT_LABEL: - widget_text(dpi, w, widgetIndex); + WidgetText(dpi, w, widgetIndex); break; case WWT_SPINNER: case WWT_DROPDOWN: case WWT_VIEWPORT: - widget_text_inset(dpi, w, widgetIndex); + WidgetTextInset(dpi, w, widgetIndex); break; case WWT_GROUPBOX: - widget_groupbox_draw(dpi, w, widgetIndex); + WidgetGroupboxDraw(dpi, w, widgetIndex); break; case WWT_CAPTION: - widget_caption_draw(dpi, w, widgetIndex); + WidgetCaptionDraw(dpi, w, widgetIndex); break; case WWT_CLOSEBOX: - widget_closebox_draw(dpi, w, widgetIndex); + WidgetCloseboxDraw(dpi, w, widgetIndex); break; case WWT_SCROLL: - widget_scroll_draw(dpi, w, widgetIndex); + WidgetScrollDraw(dpi, w, widgetIndex); break; case WWT_CHECKBOX: - widget_checkbox_draw(dpi, w, widgetIndex); + WidgetCheckboxDraw(dpi, w, widgetIndex); break; case WWT_PLACEHOLDER: break; case WWT_TEXT_BOX: - widget_text_box_draw(dpi, w, widgetIndex); + WidgetTextBoxDraw(dpi, w, widgetIndex); break; } } @@ -110,7 +110,7 @@ void widget_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIn * * rct2: 0x006EB6CE */ -static void widget_frame_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetFrameDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -144,7 +144,7 @@ static void widget_frame_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgeti * * rct2: 0x006EB765 */ -static void widget_resize_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetResizeDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -175,7 +175,7 @@ static void widget_resize_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget * * rct2: 0x006EB8E5 */ -static void widget_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetButtonDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -185,8 +185,7 @@ static void widget_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget w->windowPos + ScreenCoordsXY{ widget->right, widget->bottom } }; // Check if the button is pressed down - uint8_t press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET - : 0; + uint8_t press = WidgetIsPressed(w, widgetIndex) || WidgetIsActiveTool(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; // Get the colour uint8_t colour = w->colours[widget->colour]; @@ -201,14 +200,14 @@ static void widget_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget // Draw the border with fill gfx_fill_rect_inset(dpi, rect, colour, press); - widget_draw_image(dpi, w, widgetIndex); + WidgetDrawImage(dpi, w, widgetIndex); } /** * * rct2: 0x006EB806 */ -static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetTabDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -218,7 +217,7 @@ static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind if (widget->type == WWT_TAB) { - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) return; if (widget->image == static_cast(SPR_NONE)) @@ -229,15 +228,15 @@ static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind } // Draw widgets that aren't explicitly disabled. - if (!widget_is_disabled(w, widgetIndex)) + if (!WidgetIsDisabled(w, widgetIndex)) { - widget_draw_image(dpi, w, widgetIndex); + WidgetDrawImage(dpi, w, widgetIndex); return; } if (widget->type != WWT_TRNBTN) { - widget_draw_image(dpi, w, widgetIndex); + WidgetDrawImage(dpi, w, widgetIndex); return; } @@ -256,11 +255,11 @@ static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind * * rct2: 0x006EB861 */ -static void widget_flat_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetFlatButtonDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { - if (!widget_is_disabled(w, widgetIndex) && widget_is_highlighted(w, widgetIndex)) + if (!WidgetIsDisabled(w, widgetIndex) && WidgetIsHighlighted(w, widgetIndex)) { - widget_button_draw(dpi, w, widgetIndex); + WidgetButtonDraw(dpi, w, widgetIndex); return; } @@ -275,7 +274,7 @@ static void widget_flat_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_w uint8_t colour = w->colours[widget->colour]; // Check if the button is pressed down - if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) + if (WidgetIsPressed(w, widgetIndex) || WidgetIsActiveTool(w, widgetIndex)) { if (static_cast(widget->image) == -2) { @@ -289,14 +288,14 @@ static void widget_flat_button_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_w } // Draw image - widget_draw_image(dpi, w, widgetIndex); + WidgetDrawImage(dpi, w, widgetIndex); } /** * * rct2: 0x006EBBEB */ -static void widget_text_button(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetTextButton(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -309,18 +308,17 @@ static void widget_text_button(rct_drawpixelinfo* dpi, rct_window* w, rct_widget uint8_t colour = w->colours[widget->colour]; // Border - uint8_t press = widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET - : 0; + uint8_t press = WidgetIsPressed(w, widgetIndex) || WidgetIsActiveTool(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; gfx_fill_rect_inset(dpi, rect, colour, press); // Button caption if (widget->type != WWT_TABLE_HEADER) { - widget_text_centred(dpi, w, widgetIndex); + WidgetTextCentred(dpi, w, widgetIndex); } else { - widget_text(dpi, w, widgetIndex); + WidgetText(dpi, w, widgetIndex); } } @@ -328,7 +326,7 @@ static void widget_text_button(rct_drawpixelinfo* dpi, rct_window* w, rct_widget * * rct2: 0x006EBC41 */ -static void widget_text_centred(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetTextCentred(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -339,7 +337,7 @@ static void widget_text_centred(rct_drawpixelinfo* dpi, rct_window* w, rct_widge // Get the colour uint8_t colour = w->colours[widget->colour]; colour &= ~(COLOUR_FLAG_TRANSLUCENT); - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) colour |= COLOUR_FLAG_INSET; // Resolve the absolute ltrb @@ -366,7 +364,7 @@ static void widget_text_centred(rct_drawpixelinfo* dpi, rct_window* w, rct_widge * * rct2: 0x006EBD52 */ -static void widget_text(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetText(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -376,7 +374,7 @@ static void widget_text(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex w // Get the colour uint8_t colour = w->colours[widget->colour]; - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) colour |= COLOUR_FLAG_INSET; // Resolve the absolute ltrb @@ -406,7 +404,7 @@ static void widget_text(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex w * * rct2: 0x006EBD1F */ -static void widget_text_inset(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetTextInset(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -419,7 +417,7 @@ static void widget_text_inset(rct_drawpixelinfo* dpi, rct_window* w, rct_widgeti uint8_t colour = w->colours[widget->colour]; gfx_fill_rect_inset(dpi, rect, colour, INSET_RECT_F_60); - widget_text(dpi, w, widgetIndex); + WidgetText(dpi, w, widgetIndex); } static std::pair widget_get_stringid_and_args(const rct_widget* widget) @@ -446,7 +444,7 @@ static std::pair widget_get_stringid_and_args(const rct_wi * * rct2: 0x006EB535 */ -static void widget_groupbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetGroupboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -463,7 +461,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg if (stringId != STR_NONE) { uint8_t colour = w->colours[widget->colour] & 0x7F; - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) colour |= COLOUR_FLAG_INSET; utf8 buffer[512] = { 0 }; @@ -509,7 +507,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg * * rct2: 0x006EB2F9 */ -static void widget_caption_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetCaptionDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -556,7 +554,7 @@ static void widget_caption_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widge * * rct2: 0x006EBB85 */ -static void widget_closebox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetCloseboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -569,7 +567,7 @@ static void widget_closebox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg uint8_t press = 0; if (w->flags & WF_10) press |= INSET_RECT_FLAG_FILL_MID_LIGHT; - if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) + if (WidgetIsPressed(w, widgetIndex) || WidgetIsActiveTool(w, widgetIndex)) press |= INSET_RECT_FLAG_BORDER_INSET; // Get the colour @@ -583,7 +581,7 @@ static void widget_closebox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg topLeft = w->windowPos + ScreenCoordsXY{ widget->midX() - 1, std::max(widget->top, widget->midY() - 5) }; - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) colour |= COLOUR_FLAG_INSET; DrawTextEllipsised(dpi, topLeft, widget->width() - 2, widget->text, Formatter::Common(), colour, TextAlignment::CENTRE); @@ -593,7 +591,7 @@ static void widget_closebox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg * * rct2: 0x006EBAD9 */ -static void widget_checkbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetCheckboxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -609,13 +607,13 @@ static void widget_checkbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg // checkbox gfx_fill_rect_inset(dpi, { midLeft - ScreenCoordsXY{ 0, 5 }, midLeft + ScreenCoordsXY{ 9, 4 } }, colour, INSET_RECT_F_60); - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) { colour |= COLOUR_FLAG_INSET; } // fill it when checkbox is pressed - if (widget_is_pressed(w, widgetIndex)) + if (WidgetIsPressed(w, widgetIndex)) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gfx_draw_string( @@ -634,7 +632,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widg * * rct2: 0x006EBD96 */ -static void widget_scroll_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetScrollDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget int32_t scrollIndex = window_get_scroll_data_index(w, widgetIndex); @@ -661,14 +659,14 @@ static void widget_scroll_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget // Horizontal scrollbar if (scroll->flags & HSCROLLBAR_VISIBLE) - widget_hscrollbar_draw( + WidgetHScrollbarDraw( dpi, scroll, topLeft.x, bottomRight.y - SCROLLBAR_WIDTH, ((scroll->flags & VSCROLLBAR_VISIBLE) ? bottomRight.x - (SCROLLBAR_WIDTH + 1) : bottomRight.x), bottomRight.y, colour); // Vertical scrollbar if (scroll->flags & VSCROLLBAR_VISIBLE) - widget_vscrollbar_draw( + WidgetVScrollbarDraw( dpi, scroll, bottomRight.x - SCROLLBAR_WIDTH, topLeft.y, bottomRight.x, ((scroll->flags & HSCROLLBAR_VISIBLE) ? bottomRight.y - (SCROLLBAR_WIDTH + 1) : bottomRight.y), colour); @@ -704,7 +702,7 @@ static void widget_scroll_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget window_event_scroll_paint_call(w, &scroll_dpi, scrollIndex); } -static void widget_hscrollbar_draw( +static void WidgetHScrollbarDraw( rct_drawpixelinfo* dpi, rct_scroll* scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour) { colour &= 0x7F; @@ -742,7 +740,7 @@ static void widget_hscrollbar_draw( } } -static void widget_vscrollbar_draw( +static void WidgetVScrollbarDraw( rct_drawpixelinfo* dpi, rct_scroll* scroll, int32_t l, int32_t t, int32_t r, int32_t b, int32_t colour) { colour &= 0x7F; @@ -778,7 +776,7 @@ static void widget_vscrollbar_draw( * * rct2: 0x006EB951 */ -static void widget_draw_image(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; @@ -795,10 +793,10 @@ static void widget_draw_image(rct_drawpixelinfo* dpi, rct_window* w, rct_widgeti uint8_t colour = NOT_TRANSLUCENT(w->colours[widget->colour]); if (widget->type == WWT_COLOURBTN || widget->type == WWT_TRNBTN || widget->type == WWT_TAB) - if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) + if (WidgetIsPressed(w, widgetIndex) || WidgetIsActiveTool(w, widgetIndex)) image++; - if (widget_is_disabled(w, widgetIndex)) + if (WidgetIsDisabled(w, widgetIndex)) { // Draw greyed out (light border bottom right shadow) colour = w->colours[widget->colour]; @@ -826,17 +824,17 @@ static void widget_draw_image(rct_drawpixelinfo* dpi, rct_window* w, rct_widgeti } } -bool widget_is_enabled(rct_window* w, rct_widgetindex widgetIndex) +bool WidgetIsEnabled(rct_window* w, rct_widgetindex widgetIndex) { return (w->enabled_widgets & (1LL << widgetIndex)) != 0; } -bool widget_is_disabled(rct_window* w, rct_widgetindex widgetIndex) +bool WidgetIsDisabled(rct_window* w, rct_widgetindex widgetIndex) { return (w->disabled_widgets & (1LL << widgetIndex)) != 0; } -bool widget_is_pressed(rct_window* w, rct_widgetindex widgetIndex) +bool WidgetIsPressed(rct_window* w, rct_widgetindex widgetIndex) { if (w->pressed_widgets & (1LL << widgetIndex)) { @@ -857,7 +855,7 @@ bool widget_is_pressed(rct_window* w, rct_widgetindex widgetIndex) return false; } -bool widget_is_highlighted(rct_window* w, rct_widgetindex widgetIndex) +bool WidgetIsHighlighted(rct_window* w, rct_widgetindex widgetIndex) { if (gHoverWidget.window_classification != w->classification) return false; @@ -868,7 +866,7 @@ bool widget_is_highlighted(rct_window* w, rct_widgetindex widgetIndex) return true; } -bool widget_is_active_tool(rct_window* w, rct_widgetindex widgetIndex) +bool WidgetIsActiveTool(rct_window* w, rct_widgetindex widgetIndex) { if (!(input_test_flag(INPUT_FLAG_TOOL_ACTIVE))) return false; @@ -892,7 +890,7 @@ bool widget_is_active_tool(rct_window* w, rct_widgetindex widgetIndex) * esi: w * edi: widget */ -void widget_scroll_get_part( +void WidgetScrollGetPart( rct_window* w, rct_widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords, int32_t* output_scroll_area, int32_t* scroll_id) { @@ -999,7 +997,7 @@ void widget_scroll_get_part( } } -void widget_set_enabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled) +void WidgetSetEnabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled) { if (enabled) { @@ -1013,7 +1011,7 @@ void widget_set_enabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled } } -void widget_set_checkbox_value(rct_window* w, rct_widgetindex widgetIndex, int32_t value) +void WidgetSetCheckboxValue(rct_window* w, rct_widgetindex widgetIndex, int32_t value) { if (value) w->pressed_widgets |= (1ULL << widgetIndex); @@ -1021,7 +1019,7 @@ void widget_set_checkbox_value(rct_window* w, rct_widgetindex widgetIndex, int32 w->pressed_widgets &= ~(1ULL << widgetIndex); } -static void widget_text_box_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) +static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex) { int32_t no_lines = 0; int32_t font_height = 0; diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 80d8873b1c4f..13a620961a2f 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -350,7 +350,7 @@ static void window_scroll_wheel_input(rct_window* w, int32_t scrollIndex, int32_ scroll->h_left = std::min(std::max(0, scroll->h_left + wheel), size); } - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); widget_invalidate(w, widgetIndex); } @@ -459,7 +459,7 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex, return false; } - if (widget_is_disabled(w, buttonWidgetIndex)) + if (WidgetIsDisabled(w, buttonWidgetIndex)) { return false; } @@ -579,7 +579,7 @@ void window_init_scroll_widgets(rct_window* w) if (widget->content & SCROLL_VERTICAL) scroll->flags |= VSCROLLBAR_VISIBLE; - widget_scroll_update_thumbs(w, widget_index); + WidgetScrollUpdateThumbs(w, widget_index); widget_index++; scroll_index++; @@ -606,7 +606,7 @@ void window_draw_widgets(rct_window* w, rct_drawpixelinfo* dpi) // Check if widget is outside the draw region if (w->windowPos.x + widget->left < dpi->x + dpi->width && w->windowPos.x + widget->right >= dpi->x) if (w->windowPos.y + widget->top < dpi->y + dpi->height && w->windowPos.y + widget->bottom >= dpi->y) - widget_draw(dpi, w, widgetIndex); + WidgetDraw(dpi, w, widgetIndex); widgetIndex++; } @@ -636,7 +636,7 @@ static void window_invalidate_pressed_image_buttons(rct_window* w) if (widget->type != WWT_IMGBTN) continue; - if (widget_is_pressed(w, widgetIndex) || widget_is_active_tool(w, widgetIndex)) + if (WidgetIsPressed(w, widgetIndex) || WidgetIsActiveTool(w, widgetIndex)) gfx_set_dirty_blocks({ w->windowPos, w->windowPos + ScreenCoordsXY{ w->width, w->height } }); } } diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index 5ab421a7a156..a848c9546294 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -471,7 +471,7 @@ namespace OpenRCT2::Ui::Windows widget.flags ^= WIDGET_FLAGS::IS_PRESSED; bool isChecked = widget.flags & WIDGET_FLAGS::IS_PRESSED; - widget_set_checkbox_value(w, widgetIndex, isChecked); + WidgetSetCheckboxValue(w, widgetIndex, isChecked); std::vector args; auto ctx = widgetDesc->OnChange.context(); @@ -579,7 +579,7 @@ namespace OpenRCT2::Ui::Windows { if (widget->type == WWT_SCROLL) { - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); } widgetIndex++; } @@ -685,7 +685,7 @@ namespace OpenRCT2::Ui::Windows { auto widgetIndex = static_cast(WIDX_TAB_0 + tabIndex); auto widget = &w->widgets[widgetIndex]; - if (widget_is_enabled(w, widgetIndex)) + if (WidgetIsEnabled(w, widgetIndex)) { auto leftTop = w->windowPos + tab.offset + ScreenCoordsXY{ widget->left, widget->top }; auto image = tab.imageFrameBase; diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp index a538b9089c5e..f0be03d16b35 100644 --- a/src/openrct2-ui/scripting/ScWidget.hpp +++ b/src/openrct2-ui/scripting/ScWidget.hpp @@ -284,7 +284,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return widget_is_disabled(w, _widgetIndex); + return WidgetIsDisabled(w, _widgetIndex); } return false; } @@ -432,7 +432,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return widget_is_pressed(w, _widgetIndex); + return WidgetIsPressed(w, _widgetIndex); } return false; } @@ -441,7 +441,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - widget_set_checkbox_value(w, _widgetIndex, value ? 1 : 0); + WidgetSetCheckboxValue(w, _widgetIndex, value ? 1 : 0); Invalidate(); } } @@ -486,7 +486,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return widget_is_pressed(w, _widgetIndex); + return WidgetIsPressed(w, _widgetIndex); } return false; } @@ -495,7 +495,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - widget_set_checkbox_value(w, _widgetIndex, value ? 1 : 0); + WidgetSetCheckboxValue(w, _widgetIndex, value ? 1 : 0); Invalidate(); } } diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index b907ee77017d..dd91f8e1d8af 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -1042,7 +1042,7 @@ static void window_cheats_invalidate(rct_window* w) { case WINDOW_CHEATS_PAGE_MONEY: { - widget_set_checkbox_value(w, WIDX_NO_MONEY, gParkFlags & PARK_FLAGS_NO_MONEY); + WidgetSetCheckboxValue(w, WIDX_NO_MONEY, gParkFlags & PARK_FLAGS_NO_MONEY); uint64_t money_widgets = (1 << WIDX_ADD_SET_MONEY_GROUP) | (1 << WIDX_MONEY_SPINNER) | (1 << WIDX_MONEY_SPINNER_INCREMENT) | (1 << WIDX_MONEY_SPINNER_DECREMENT) | (1 << WIDX_ADD_MONEY) @@ -1061,34 +1061,34 @@ static void window_cheats_invalidate(rct_window* w) { auto ft = Formatter::Common(); ft.Add(MONEY(1000, 00)); - widget_set_checkbox_value(w, WIDX_GUEST_IGNORE_RIDE_INTENSITY, gCheatsIgnoreRideIntensity); - widget_set_checkbox_value(w, WIDX_DISABLE_VANDALISM, gCheatsDisableVandalism); - widget_set_checkbox_value(w, WIDX_DISABLE_LITTERING, gCheatsDisableLittering); + WidgetSetCheckboxValue(w, WIDX_GUEST_IGNORE_RIDE_INTENSITY, gCheatsIgnoreRideIntensity); + WidgetSetCheckboxValue(w, WIDX_DISABLE_VANDALISM, gCheatsDisableVandalism); + WidgetSetCheckboxValue(w, WIDX_DISABLE_LITTERING, gCheatsDisableLittering); } break; case WINDOW_CHEATS_PAGE_MISC: w->widgets[WIDX_OPEN_CLOSE_PARK].text = (gParkFlags & PARK_FLAGS_PARK_OPEN) ? STR_CHEAT_CLOSE_PARK : STR_CHEAT_OPEN_PARK; - widget_set_checkbox_value(w, WIDX_FORCE_PARK_RATING, get_forced_park_rating() >= 0); - widget_set_checkbox_value(w, WIDX_FREEZE_WEATHER, gCheatsFreezeWeather); - widget_set_checkbox_value(w, WIDX_NEVERENDING_MARKETING, gCheatsNeverendingMarketing); - widget_set_checkbox_value(w, WIDX_DISABLE_PLANT_AGING, gCheatsDisablePlantAging); + WidgetSetCheckboxValue(w, WIDX_FORCE_PARK_RATING, get_forced_park_rating() >= 0); + WidgetSetCheckboxValue(w, WIDX_FREEZE_WEATHER, gCheatsFreezeWeather); + WidgetSetCheckboxValue(w, WIDX_NEVERENDING_MARKETING, gCheatsNeverendingMarketing); + WidgetSetCheckboxValue(w, WIDX_DISABLE_PLANT_AGING, gCheatsDisablePlantAging); break; case WINDOW_CHEATS_PAGE_RIDES: - widget_set_checkbox_value(w, WIDX_FAST_LIFT_HILL, gCheatsFastLiftHill); - widget_set_checkbox_value(w, WIDX_DISABLE_BRAKES_FAILURE, gCheatsDisableBrakesFailure); - widget_set_checkbox_value(w, WIDX_DISABLE_ALL_BREAKDOWNS, gCheatsDisableAllBreakdowns); - widget_set_checkbox_value(w, WIDX_BUILD_IN_PAUSE_MODE, gCheatsBuildInPauseMode); - widget_set_checkbox_value(w, WIDX_SHOW_ALL_OPERATING_MODES, gCheatsShowAllOperatingModes); - widget_set_checkbox_value(w, WIDX_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES, gCheatsShowVehiclesFromOtherTrackTypes); - widget_set_checkbox_value(w, WIDX_DISABLE_TRAIN_LENGTH_LIMITS, gCheatsDisableTrainLengthLimit); - widget_set_checkbox_value(w, WIDX_ENABLE_CHAIN_LIFT_ON_ALL_TRACK, gCheatsEnableChainLiftOnAllTrack); - widget_set_checkbox_value(w, WIDX_ENABLE_ARBITRARY_RIDE_TYPE_CHANGES, gCheatsAllowArbitraryRideTypeChanges); - widget_set_checkbox_value(w, WIDX_DISABLE_RIDE_VALUE_AGING, gCheatsDisableRideValueAging); - widget_set_checkbox_value(w, WIDX_IGNORE_RESEARCH_STATUS, gCheatsIgnoreResearchStatus); - widget_set_checkbox_value(w, WIDX_ENABLE_ALL_DRAWABLE_TRACK_PIECES, gCheatsEnableAllDrawableTrackPieces); - widget_set_checkbox_value(w, WIDX_ALLOW_TRACK_PLACE_INVALID_HEIGHTS, gCheatsAllowTrackPlaceInvalidHeights); + WidgetSetCheckboxValue(w, WIDX_FAST_LIFT_HILL, gCheatsFastLiftHill); + WidgetSetCheckboxValue(w, WIDX_DISABLE_BRAKES_FAILURE, gCheatsDisableBrakesFailure); + WidgetSetCheckboxValue(w, WIDX_DISABLE_ALL_BREAKDOWNS, gCheatsDisableAllBreakdowns); + WidgetSetCheckboxValue(w, WIDX_BUILD_IN_PAUSE_MODE, gCheatsBuildInPauseMode); + WidgetSetCheckboxValue(w, WIDX_SHOW_ALL_OPERATING_MODES, gCheatsShowAllOperatingModes); + WidgetSetCheckboxValue(w, WIDX_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES, gCheatsShowVehiclesFromOtherTrackTypes); + WidgetSetCheckboxValue(w, WIDX_DISABLE_TRAIN_LENGTH_LIMITS, gCheatsDisableTrainLengthLimit); + WidgetSetCheckboxValue(w, WIDX_ENABLE_CHAIN_LIFT_ON_ALL_TRACK, gCheatsEnableChainLiftOnAllTrack); + WidgetSetCheckboxValue(w, WIDX_ENABLE_ARBITRARY_RIDE_TYPE_CHANGES, gCheatsAllowArbitraryRideTypeChanges); + WidgetSetCheckboxValue(w, WIDX_DISABLE_RIDE_VALUE_AGING, gCheatsDisableRideValueAging); + WidgetSetCheckboxValue(w, WIDX_IGNORE_RESEARCH_STATUS, gCheatsIgnoreResearchStatus); + WidgetSetCheckboxValue(w, WIDX_ENABLE_ALL_DRAWABLE_TRACK_PIECES, gCheatsEnableAllDrawableTrackPieces); + WidgetSetCheckboxValue(w, WIDX_ALLOW_TRACK_PLACE_INVALID_HEIGHTS, gCheatsAllowTrackPlaceInvalidHeights); break; } @@ -1138,7 +1138,7 @@ static void window_cheats_paint(rct_window* w, rct_drawpixelinfo* dpi) uint8_t colour = w->colours[1]; auto ft = Formatter(); ft.Add(_moneySpinnerValue); - if (widget_is_disabled(w, WIDX_MONEY_SPINNER)) + if (WidgetIsDisabled(w, WIDX_MONEY_SPINNER)) { colour |= COLOUR_FLAG_INSET; } diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index a387f8dacb2c..977fdc45fdb7 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -150,11 +150,11 @@ static void window_debug_paint_invalidate(rct_window* w) w->Invalidate(); } - widget_set_checkbox_value(w, WIDX_TOGGLE_SHOW_WIDE_PATHS, gPaintWidePathsAsGhost); - widget_set_checkbox_value(w, WIDX_TOGGLE_SHOW_BLOCKED_TILES, gPaintBlockedTiles); - widget_set_checkbox_value(w, WIDX_TOGGLE_SHOW_SEGMENT_HEIGHTS, gShowSupportSegmentHeights); - widget_set_checkbox_value(w, WIDX_TOGGLE_SHOW_BOUND_BOXES, gPaintBoundingBoxes); - widget_set_checkbox_value(w, WIDX_TOGGLE_SHOW_DIRTY_VISUALS, gShowDirtyVisuals); + WidgetSetCheckboxValue(w, WIDX_TOGGLE_SHOW_WIDE_PATHS, gPaintWidePathsAsGhost); + WidgetSetCheckboxValue(w, WIDX_TOGGLE_SHOW_BLOCKED_TILES, gPaintBlockedTiles); + WidgetSetCheckboxValue(w, WIDX_TOGGLE_SHOW_SEGMENT_HEIGHTS, gShowSupportSegmentHeights); + WidgetSetCheckboxValue(w, WIDX_TOGGLE_SHOW_BOUND_BOXES, gPaintBoundingBoxes); + WidgetSetCheckboxValue(w, WIDX_TOGGLE_SHOW_DIRTY_VISUALS, gShowDirtyVisuals); } static void window_debug_paint_paint(rct_window* w, rct_drawpixelinfo* dpi) diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 60536bfa53ec..8f2791e02abd 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -233,7 +233,7 @@ static ResearchItem* get_research_item_at(const ScreenCoordsXY& screenCoords, in gPressedWidget.widget_index = widgetIndex; int32_t outScrollArea; ScreenCoordsXY outScrollCoords; - widget_scroll_get_part(w, widget, screenCoords, outScrollCoords, &outScrollArea, outScrollId); + WidgetScrollGetPart(w, widget, screenCoords, outScrollCoords, &outScrollArea, outScrollId); if (outScrollArea == SCROLL_PART_VIEW) { *outScrollId = *outScrollId == 0 ? 0 : 1; diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index fd25daf582ec..0ce531201ea2 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -481,7 +481,7 @@ static void window_finances_summary_invertscroll(rct_window* w) { rct_widget summary = w->widgets[WIDX_SUMMARY_SCROLL]; w->scrolls[0].h_left = std::max(0, w->scrolls[0].h_right - (summary.width() - 2)); - widget_scroll_update_thumbs(w, WIDX_SUMMARY_SCROLL); + WidgetScrollUpdateThumbs(w, WIDX_SUMMARY_SCROLL); } /** diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 33d1abc7cade..d796083f48fb 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -336,8 +336,8 @@ static void window_land_paint(rct_window* w, rct_drawpixelinfo* dpi) screenCoords = { w->windowPos.x + previewWidget->left, w->windowPos.y + previewWidget->top }; int32_t sprite = gLandToolSize % 2 == 0 ? SPR_G2_MOUNTAIN_TOOL_EVEN : SPR_G2_MOUNTAIN_TOOL_ODD; gfx_draw_sprite(dpi, sprite, screenCoords, 0); - widget_draw(dpi, w, WIDX_DECREMENT); - widget_draw(dpi, w, WIDX_INCREMENT); + WidgetDraw(dpi, w, WIDX_DECREMENT); + WidgetDraw(dpi, w, WIDX_INCREMENT); } screenCoords = { w->windowPos.x + previewWidget->midX(), w->windowPos.y + previewWidget->bottom + 5 }; diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 9bbb3edc665d..54c9b6a42856 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -586,7 +586,7 @@ static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, const gLandToolTerrainSurface, gLandToolTerrainEdge); GameActions::Execute(&surfaceSetStyleAction); } - else if (widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS)) + else if (WidgetIsActiveTool(w, WIDX_SET_LAND_RIGHTS)) { // Set land rights int32_t landRightsToolSize = std::max(1, _landRightsToolSize); @@ -800,7 +800,7 @@ static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi) + ScreenCoordsXY{ window_map_widgets[WIDX_LAND_TOOL].midX(), window_map_widgets[WIDX_LAND_TOOL].midY() }; // Draw land tool size - if (widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS) && _landRightsToolSize > MAX_TOOL_SIZE_WITH_SPRITE) + if (WidgetIsActiveTool(w, WIDX_SET_LAND_RIGHTS) && _landRightsToolSize > MAX_TOOL_SIZE_WITH_SPRITE) { gfx_draw_string_centred( dpi, STR_LAND_TOOL_SIZE_VALUE, screenCoords - ScreenCoordsXY{ 0, 2 }, COLOUR_BLACK, &_landRightsToolSize); @@ -843,7 +843,7 @@ static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi) } } } - else if (!widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS)) + else if (!WidgetIsActiveTool(w, WIDX_SET_LAND_RIGHTS)) { gfx_draw_string_left( dpi, STR_MAP_SIZE, nullptr, w->colours[1], @@ -940,7 +940,7 @@ static void window_map_centre_on_view_point() w_map->scrolls[0].h_left = cx; w_map->scrolls[0].v_top = dx; - widget_scroll_update_thumbs(w_map, WIDX_MAP); + WidgetScrollUpdateThumbs(w_map, WIDX_MAP); } /** diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 39b86c9b0b68..bb36bf3aa1b9 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -985,19 +985,19 @@ static void window_mapgen_simplex_invalidate(rct_window* w) w->widgets[WIDX_SIMPLEX_FLOOR_TEXTURE].image = surfaceImage; w->widgets[WIDX_SIMPLEX_WALL_TEXTURE].image = edgeImage; - widget_set_checkbox_value(w, WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX, _randomTerrain != 0); - widget_set_checkbox_value(w, WIDX_SIMPLEX_PLACE_TREES_CHECKBOX, _placeTrees != 0); + WidgetSetCheckboxValue(w, WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX, _randomTerrain != 0); + WidgetSetCheckboxValue(w, WIDX_SIMPLEX_PLACE_TREES_CHECKBOX, _placeTrees != 0); // Only allow floor and wall texture options if random terrain is disabled if (!_randomTerrain) { - widget_set_enabled(w, WIDX_SIMPLEX_FLOOR_TEXTURE, true); - widget_set_enabled(w, WIDX_SIMPLEX_WALL_TEXTURE, true); + WidgetSetEnabled(w, WIDX_SIMPLEX_FLOOR_TEXTURE, true); + WidgetSetEnabled(w, WIDX_SIMPLEX_WALL_TEXTURE, true); } else { - widget_set_enabled(w, WIDX_SIMPLEX_FLOOR_TEXTURE, false); - widget_set_enabled(w, WIDX_SIMPLEX_WALL_TEXTURE, false); + WidgetSetEnabled(w, WIDX_SIMPLEX_FLOOR_TEXTURE, false); + WidgetSetEnabled(w, WIDX_SIMPLEX_WALL_TEXTURE, false); } window_mapgen_set_pressed_tab(w); @@ -1166,21 +1166,21 @@ static void window_mapgen_heightmap_mouseup(rct_window* w, rct_widgetindex widge } case WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP: _heightmapSmoothMap = !_heightmapSmoothMap; - widget_set_checkbox_value(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, _heightmapSmoothMap); - widget_set_enabled(w, WIDX_HEIGHTMAP_STRENGTH, _heightmapSmoothMap); - widget_set_enabled(w, WIDX_HEIGHTMAP_STRENGTH_UP, _heightmapSmoothMap); - widget_set_enabled(w, WIDX_HEIGHTMAP_STRENGTH_DOWN, _heightmapSmoothMap); + WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, _heightmapSmoothMap); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_STRENGTH, _heightmapSmoothMap); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_STRENGTH_UP, _heightmapSmoothMap); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_STRENGTH_DOWN, _heightmapSmoothMap); widget_invalidate(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP); widget_invalidate(w, WIDX_HEIGHTMAP_STRENGTH); break; case WIDX_HEIGHTMAP_NORMALIZE: _heightmapNormalize = !_heightmapNormalize; - widget_set_checkbox_value(w, WIDX_HEIGHTMAP_NORMALIZE, _heightmapNormalize); + WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_NORMALIZE, _heightmapNormalize); widget_invalidate(w, WIDX_HEIGHTMAP_NORMALIZE); break; case WIDX_HEIGHTMAP_SMOOTH_TILES: _heightmapSmoothTiles = !_heightmapSmoothTiles; - widget_set_checkbox_value(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles); + WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles); widget_invalidate(w, WIDX_HEIGHTMAP_SMOOTH_TILES); break; } @@ -1197,9 +1197,9 @@ static void window_mapgen_heightmap_invalidate(rct_window* w) window_init_scroll_widgets(w); } - widget_set_checkbox_value(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, _heightmapSmoothMap); - widget_set_checkbox_value(w, WIDX_HEIGHTMAP_NORMALIZE, _heightmapNormalize); - widget_set_checkbox_value(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles); + WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, _heightmapSmoothMap); + WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_NORMALIZE, _heightmapNormalize); + WidgetSetCheckboxValue(w, WIDX_HEIGHTMAP_SMOOTH_TILES, _heightmapSmoothTiles); window_mapgen_set_pressed_tab(w); } @@ -1274,21 +1274,21 @@ static void window_mapgen_set_page(rct_window* w, int32_t page) // Enable heightmap widgets if one is loaded if (page == WINDOW_MAPGEN_PAGE_HEIGHTMAP && _heightmapLoaded) { - widget_set_enabled(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_STRENGTH, _heightmapSmoothMap); - widget_set_enabled(w, WIDX_HEIGHTMAP_STRENGTH_UP, _heightmapSmoothMap); - widget_set_enabled(w, WIDX_HEIGHTMAP_STRENGTH_DOWN, _heightmapSmoothMap); - widget_set_enabled(w, WIDX_HEIGHTMAP_NORMALIZE, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_SMOOTH_TILES, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_HIGH, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_HIGH_UP, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_HIGH_DOWN, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_LOW, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_LOW_UP, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_LOW_DOWN, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_WATER_LEVEL, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_WATER_LEVEL_UP, true); - widget_set_enabled(w, WIDX_HEIGHTMAP_WATER_LEVEL_DOWN, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_STRENGTH, _heightmapSmoothMap); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_STRENGTH_UP, _heightmapSmoothMap); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_STRENGTH_DOWN, _heightmapSmoothMap); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_NORMALIZE, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_SMOOTH_TILES, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_HIGH, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_HIGH_UP, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_HIGH_DOWN, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_LOW, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_LOW_UP, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_LOW_DOWN, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_WATER_LEVEL, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_WATER_LEVEL_UP, true); + WidgetSetEnabled(w, WIDX_HEIGHTMAP_WATER_LEVEL_DOWN, true); } window_init_scroll_widgets(w); diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 25626a5c398d..a1c34e799e0c 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -301,14 +301,14 @@ static void window_maze_construction_update(rct_window* w) switch (_rideConstructionState) { case RIDE_CONSTRUCTION_STATE_PLACE: - if (!widget_is_active_tool(w, WIDX_MAZE_DIRECTION_GROUPBOX)) + if (!WidgetIsActiveTool(w, WIDX_MAZE_DIRECTION_GROUPBOX)) { window_close(w); return; } break; case RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT: - if (!widget_is_active_tool(w, WIDX_MAZE_ENTRANCE) && !widget_is_active_tool(w, WIDX_MAZE_EXIT)) + if (!WidgetIsActiveTool(w, WIDX_MAZE_ENTRANCE) && !WidgetIsActiveTool(w, WIDX_MAZE_EXIT)) { _rideConstructionState = gRideEntranceExitPlacePreviousRideConstructionState; window_maze_construction_update_pressed_widgets(); diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index f0547898471b..77b78c51af90 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -971,9 +971,9 @@ static void window_multiplayer_options_invalidate(rct_window* w) w->widgets[WIDX_KNOWN_KEYS_ONLY_CHECKBOX].type = WWT_EMPTY; } - widget_set_checkbox_value(w, WIDX_LOG_CHAT_CHECKBOX, gConfigNetwork.log_chat); - widget_set_checkbox_value(w, WIDX_LOG_SERVER_ACTIONS_CHECKBOX, gConfigNetwork.log_server_actions); - widget_set_checkbox_value(w, WIDX_KNOWN_KEYS_ONLY_CHECKBOX, gConfigNetwork.known_keys_only); + WidgetSetCheckboxValue(w, WIDX_LOG_CHAT_CHECKBOX, gConfigNetwork.log_chat); + WidgetSetCheckboxValue(w, WIDX_LOG_SERVER_ACTIONS_CHECKBOX, gConfigNetwork.log_server_actions); + WidgetSetCheckboxValue(w, WIDX_KNOWN_KEYS_ONLY_CHECKBOX, gConfigNetwork.known_keys_only); } static void window_multiplayer_options_paint(rct_window* w, rct_drawpixelinfo* dpi) @@ -988,7 +988,7 @@ static void window_multiplayer_draw_tab_image(rct_window* w, rct_drawpixelinfo* { rct_widgetindex widgetIndex = WIDX_TAB1 + page; - if (!widget_is_disabled(w, widgetIndex)) + if (!WidgetIsDisabled(w, widgetIndex)) { if (w->page == page) { diff --git a/src/openrct2-ui/windows/Network.cpp b/src/openrct2-ui/windows/Network.cpp index 2e58389f08c1..b33810d16554 100644 --- a/src/openrct2-ui/windows/Network.cpp +++ b/src/openrct2-ui/windows/Network.cpp @@ -449,7 +449,7 @@ static void window_network_draw_tab_image(rct_window* w, rct_drawpixelinfo* dpi, { rct_widgetindex widgetIndex = WIDX_TAB1 + page; - if (!widget_is_disabled(w, widgetIndex)) + if (!WidgetIsDisabled(w, widgetIndex)) { if (w->page == page) { diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 463a2e538e81..a0addd9763a6 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -407,7 +407,7 @@ static void window_new_ride_scroll_to_focused_ride(rct_window* w) int32_t listWidgetHeight = listWidget->bottom - listWidget->top - 1; scrollHeight = std::max(0, scrollHeight - listWidgetHeight); w->scrolls[0].v_top = std::min(row * 116, scrollHeight); - widget_scroll_update_thumbs(w, WIDX_RIDE_LIST); + WidgetScrollUpdateThumbs(w, WIDX_RIDE_LIST); } /** diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 05981f1dfc83..add83ac362bd 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -85,7 +85,7 @@ rct_window* window_news_open() window_get_scroll_size(window, 0, &width, &height); widget = &window_news_widgets[WIDX_SCROLL]; window->scrolls[0].v_top = std::max(0, height - (widget->height() - 1)); - widget_scroll_update_thumbs(window, WIDX_SCROLL); + WidgetScrollUpdateThumbs(window, WIDX_SCROLL); return window; } diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 06e8048f3cdd..256e8afcd3c9 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -200,7 +200,7 @@ static void window_news_options_invalidate(rct_window* w) checkboxWidget->text = ndef->caption; const bool* configValue = get_notification_value_ptr(ndef); - widget_set_checkbox_value(w, checkboxWidgetIndex, *configValue); + WidgetSetCheckboxValue(w, checkboxWidgetIndex, *configValue); checkboxWidgetIndex++; checkboxWidget++; diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 956630edf773..21b4f07562a8 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -438,7 +438,7 @@ static void window_object_load_error_update(rct_window* w) w->frame_no++; // Check if the mouse is hovering over the list - if (!widget_is_highlighted(w, WIDX_SCROLL)) + if (!WidgetIsHighlighted(w, WIDX_SCROLL)) { highlighted_index = -1; widget_invalidate(w, WIDX_SCROLL); diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 06cb6f49c2a2..0335bafdb2e3 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -860,13 +860,13 @@ static void window_options_display_invalidate(rct_window* w) w->disabled_widgets &= ~(1 << WIDX_USE_VSYNC_CHECKBOX); } - widget_set_checkbox_value(w, WIDX_UNCAP_FPS_CHECKBOX, gConfigGeneral.uncap_fps); - widget_set_checkbox_value(w, WIDX_USE_VSYNC_CHECKBOX, gConfigGeneral.use_vsync); - widget_set_checkbox_value(w, WIDX_SHOW_FPS_CHECKBOX, gConfigGeneral.show_fps); - widget_set_checkbox_value(w, WIDX_MULTITHREADING_CHECKBOX, gConfigGeneral.multithreading); - widget_set_checkbox_value(w, WIDX_MINIMIZE_FOCUS_LOSS, gConfigGeneral.minimize_fullscreen_focus_loss); - widget_set_checkbox_value(w, WIDX_STEAM_OVERLAY_PAUSE, gConfigGeneral.steam_overlay_pause); - widget_set_checkbox_value(w, WIDX_DISABLE_SCREENSAVER_LOCK, gConfigGeneral.disable_screensaver); + WidgetSetCheckboxValue(w, WIDX_UNCAP_FPS_CHECKBOX, gConfigGeneral.uncap_fps); + WidgetSetCheckboxValue(w, WIDX_USE_VSYNC_CHECKBOX, gConfigGeneral.use_vsync); + WidgetSetCheckboxValue(w, WIDX_SHOW_FPS_CHECKBOX, gConfigGeneral.show_fps); + WidgetSetCheckboxValue(w, WIDX_MULTITHREADING_CHECKBOX, gConfigGeneral.multithreading); + WidgetSetCheckboxValue(w, WIDX_MINIMIZE_FOCUS_LOSS, gConfigGeneral.minimize_fullscreen_focus_loss); + WidgetSetCheckboxValue(w, WIDX_STEAM_OVERLAY_PAUSE, gConfigGeneral.steam_overlay_pause); + WidgetSetCheckboxValue(w, WIDX_DISABLE_SCREENSAVER_LOCK, gConfigGeneral.disable_screensaver); // Dropdown captions for straightforward strings. window_options_display_widgets[WIDX_FULLSCREEN].text = window_options_fullscreen_mode_names[gConfigGeneral.fullscreen_mode]; @@ -1030,12 +1030,12 @@ static void window_options_rendering_invalidate(rct_window* w) { window_options_common_invalidate_before(w); - widget_set_checkbox_value(w, WIDX_TILE_SMOOTHING_CHECKBOX, gConfigGeneral.landscape_smoothing); - widget_set_checkbox_value(w, WIDX_GRIDLINES_CHECKBOX, gConfigGeneral.always_show_gridlines); - widget_set_checkbox_value(w, WIDX_DAY_NIGHT_CHECKBOX, gConfigGeneral.day_night_cycle); - widget_set_checkbox_value(w, WIDX_SHOW_GUEST_PURCHASES_CHECKBOX, gConfigGeneral.show_guest_purchases); - widget_set_checkbox_value(w, WIDX_TRANSPARENT_SCREENSHOTS_CHECKBOX, gConfigGeneral.transparent_screenshot); - widget_set_checkbox_value(w, WIDX_UPPER_CASE_BANNERS_CHECKBOX, gConfigGeneral.upper_case_banners); + WidgetSetCheckboxValue(w, WIDX_TILE_SMOOTHING_CHECKBOX, gConfigGeneral.landscape_smoothing); + WidgetSetCheckboxValue(w, WIDX_GRIDLINES_CHECKBOX, gConfigGeneral.always_show_gridlines); + WidgetSetCheckboxValue(w, WIDX_DAY_NIGHT_CHECKBOX, gConfigGeneral.day_night_cycle); + WidgetSetCheckboxValue(w, WIDX_SHOW_GUEST_PURCHASES_CHECKBOX, gConfigGeneral.show_guest_purchases); + WidgetSetCheckboxValue(w, WIDX_TRANSPARENT_SCREENSHOTS_CHECKBOX, gConfigGeneral.transparent_screenshot); + WidgetSetCheckboxValue(w, WIDX_UPPER_CASE_BANNERS_CHECKBOX, gConfigGeneral.upper_case_banners); rct_string_id VirtualFloorStyleStrings[] = { STR_VIRTUAL_FLOOR_STYLE_DISABLED, STR_VIRTUAL_FLOOR_STYLE_TRANSPARENT, STR_VIRTUAL_FLOOR_STYLE_GLASSY }; @@ -1043,7 +1043,7 @@ static void window_options_rendering_invalidate(rct_window* w) window_options_rendering_widgets[WIDX_VIRTUAL_FLOOR].text = VirtualFloorStyleStrings[static_cast( gConfigGeneral.virtual_floor_style)]; - widget_set_checkbox_value(w, WIDX_ENABLE_LIGHT_FX_CHECKBOX, gConfigGeneral.enable_light_fx); + WidgetSetCheckboxValue(w, WIDX_ENABLE_LIGHT_FX_CHECKBOX, gConfigGeneral.enable_light_fx); if (gConfigGeneral.day_night_cycle && gConfigGeneral.drawing_engine == DrawingEngine::SoftwareWithHardwareDisplay) { w->disabled_widgets &= ~(1 << WIDX_ENABLE_LIGHT_FX_CHECKBOX); @@ -1054,7 +1054,7 @@ static void window_options_rendering_invalidate(rct_window* w) gConfigGeneral.enable_light_fx = false; } - widget_set_checkbox_value(w, WIDX_ENABLE_LIGHT_FX_FOR_VEHICLES_CHECKBOX, gConfigGeneral.enable_light_fx_for_vehicles); + WidgetSetCheckboxValue(w, WIDX_ENABLE_LIGHT_FX_FOR_VEHICLES_CHECKBOX, gConfigGeneral.enable_light_fx_for_vehicles); if (gConfigGeneral.day_night_cycle && gConfigGeneral.drawing_engine == DrawingEngine::SoftwareWithHardwareDisplay && gConfigGeneral.enable_light_fx) { @@ -1066,12 +1066,12 @@ static void window_options_rendering_invalidate(rct_window* w) gConfigGeneral.enable_light_fx_for_vehicles = false; } - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_RENDER_WEATHER_EFFECTS_CHECKBOX, gConfigGeneral.render_weather_effects || gConfigGeneral.render_weather_gloom); - widget_set_checkbox_value(w, WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, gConfigGeneral.disable_lightning_effect); + WidgetSetCheckboxValue(w, WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, gConfigGeneral.disable_lightning_effect); if (!gConfigGeneral.render_weather_effects && !gConfigGeneral.render_weather_gloom) { - widget_set_checkbox_value(w, WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, true); + WidgetSetCheckboxValue(w, WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, true); w->enabled_widgets &= ~(1 << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX); w->disabled_widgets |= (1 << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX); } @@ -1520,7 +1520,7 @@ static void initialize_scroll_position(rct_window* w, rct_widgetindex widget_ind int widget_size = scroll->h_right - (widget->width() - 1); scroll->h_left = ceil(volume / 100.0f * widget_size); - widget_scroll_update_thumbs(w, widget_index); + WidgetScrollUpdateThumbs(w, widget_index); } static void window_options_audio_invalidate(rct_window* w) @@ -1556,12 +1556,12 @@ static void window_options_audio_invalidate(rct_window* w) window_options_audio_widgets[WIDX_TITLE_MUSIC].text = window_options_title_music_names[gConfigSound.title_music]; - widget_set_checkbox_value(w, WIDX_SOUND_CHECKBOX, gConfigSound.sound_enabled); - widget_set_checkbox_value(w, WIDX_MASTER_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); - widget_set_checkbox_value(w, WIDX_MUSIC_CHECKBOX, gConfigSound.ride_music_enabled); - widget_set_checkbox_value(w, WIDX_AUDIO_FOCUS_CHECKBOX, gConfigSound.audio_focus); - widget_set_enabled(w, WIDX_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); - widget_set_enabled(w, WIDX_MUSIC_CHECKBOX, gConfigSound.master_sound_enabled); + WidgetSetCheckboxValue(w, WIDX_SOUND_CHECKBOX, gConfigSound.sound_enabled); + WidgetSetCheckboxValue(w, WIDX_MASTER_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); + WidgetSetCheckboxValue(w, WIDX_MUSIC_CHECKBOX, gConfigSound.ride_music_enabled); + WidgetSetCheckboxValue(w, WIDX_AUDIO_FOCUS_CHECKBOX, gConfigSound.audio_focus); + WidgetSetEnabled(w, WIDX_SOUND_CHECKBOX, gConfigSound.master_sound_enabled); + WidgetSetEnabled(w, WIDX_MUSIC_CHECKBOX, gConfigSound.master_sound_enabled); // Initialize only on first frame, otherwise the scrollbars wont be able to be modified if (w->frame_no == 0) @@ -1702,16 +1702,16 @@ static void window_options_controls_invalidate(rct_window* w) { window_options_common_invalidate_before(w); - widget_set_checkbox_value(w, WIDX_SCREEN_EDGE_SCROLLING, gConfigGeneral.edge_scrolling); - widget_set_checkbox_value(w, WIDX_TRAP_CURSOR, gConfigGeneral.trap_cursor); - widget_set_checkbox_value(w, WIDX_INVERT_DRAG, gConfigGeneral.invert_viewport_drag); - widget_set_checkbox_value(w, WIDX_ZOOM_TO_CURSOR, gConfigGeneral.zoom_to_cursor); - widget_set_checkbox_value(w, WIDX_TOOLBAR_SHOW_FINANCES, gConfigInterface.toolbar_show_finances); - widget_set_checkbox_value(w, WIDX_TOOLBAR_SHOW_RESEARCH, gConfigInterface.toolbar_show_research); - widget_set_checkbox_value(w, WIDX_TOOLBAR_SHOW_CHEATS, gConfigInterface.toolbar_show_cheats); - widget_set_checkbox_value(w, WIDX_TOOLBAR_SHOW_NEWS, gConfigInterface.toolbar_show_news); - widget_set_checkbox_value(w, WIDX_TOOLBAR_SHOW_MUTE, gConfigInterface.toolbar_show_mute); - widget_set_checkbox_value(w, WIDX_TOOLBAR_SHOW_CHAT, gConfigInterface.toolbar_show_chat); + WidgetSetCheckboxValue(w, WIDX_SCREEN_EDGE_SCROLLING, gConfigGeneral.edge_scrolling); + WidgetSetCheckboxValue(w, WIDX_TRAP_CURSOR, gConfigGeneral.trap_cursor); + WidgetSetCheckboxValue(w, WIDX_INVERT_DRAG, gConfigGeneral.invert_viewport_drag); + WidgetSetCheckboxValue(w, WIDX_ZOOM_TO_CURSOR, gConfigGeneral.zoom_to_cursor); + WidgetSetCheckboxValue(w, WIDX_TOOLBAR_SHOW_FINANCES, gConfigInterface.toolbar_show_finances); + WidgetSetCheckboxValue(w, WIDX_TOOLBAR_SHOW_RESEARCH, gConfigInterface.toolbar_show_research); + WidgetSetCheckboxValue(w, WIDX_TOOLBAR_SHOW_CHEATS, gConfigInterface.toolbar_show_cheats); + WidgetSetCheckboxValue(w, WIDX_TOOLBAR_SHOW_NEWS, gConfigInterface.toolbar_show_news); + WidgetSetCheckboxValue(w, WIDX_TOOLBAR_SHOW_MUTE, gConfigInterface.toolbar_show_mute); + WidgetSetCheckboxValue(w, WIDX_TOOLBAR_SHOW_CHAT, gConfigInterface.toolbar_show_chat); size_t activeAvailableThemeIndex = ThemeManagerGetAvailableThemeIndex(); const utf8* activeThemeName = ThemeManagerGetAvailableThemeName(activeAvailableThemeIndex); @@ -1882,11 +1882,11 @@ static void window_options_misc_invalidate(rct_window* w) window_options_misc_widgets[WIDX_REAL_NAME_CHECKBOX].tooltip = STR_OPTION_DISABLED_DURING_NETWORK_PLAY; } - widget_set_checkbox_value(w, WIDX_REAL_NAME_CHECKBOX, gConfigGeneral.show_real_names_of_guests); - widget_set_checkbox_value(w, WIDX_AUTO_STAFF_PLACEMENT, gConfigGeneral.auto_staff_placement); - widget_set_checkbox_value(w, WIDX_AUTO_OPEN_SHOPS, gConfigGeneral.auto_open_shops); - widget_set_checkbox_value(w, WIDX_TITLE_SEQUENCE_RANDOM, gConfigInterface.random_title_sequence); - widget_set_checkbox_value(w, WIDX_ALLOW_EARLY_COMPLETION, gConfigGeneral.allow_early_completion); + WidgetSetCheckboxValue(w, WIDX_REAL_NAME_CHECKBOX, gConfigGeneral.show_real_names_of_guests); + WidgetSetCheckboxValue(w, WIDX_AUTO_STAFF_PLACEMENT, gConfigGeneral.auto_staff_placement); + WidgetSetCheckboxValue(w, WIDX_AUTO_OPEN_SHOPS, gConfigGeneral.auto_open_shops); + WidgetSetCheckboxValue(w, WIDX_TITLE_SEQUENCE_RANDOM, gConfigInterface.random_title_sequence); + WidgetSetCheckboxValue(w, WIDX_ALLOW_EARLY_COMPLETION, gConfigGeneral.allow_early_completion); // Disable title sequence dropdown if set to random if (gConfigInterface.random_title_sequence) @@ -1905,7 +1905,7 @@ static void window_options_misc_invalidate(rct_window* w) else window_options_misc_widgets[WIDX_SCENARIO_GROUPING].text = STR_OPTIONS_SCENARIO_ORIGIN; - widget_set_checkbox_value(w, WIDX_SCENARIO_UNLOCKING, gConfigGeneral.scenario_unlocking_enabled); + WidgetSetCheckboxValue(w, WIDX_SCENARIO_UNLOCKING, gConfigGeneral.scenario_unlocking_enabled); if (gConfigGeneral.scenario_select_mode == SCENARIO_SELECT_MODE_ORIGIN) { @@ -2079,12 +2079,11 @@ static void window_options_advanced_invalidate(rct_window* w) { window_options_common_invalidate_before(w); - widget_set_checkbox_value(w, WIDX_DEBUGGING_TOOLS, gConfigGeneral.debugging_tools); - widget_set_checkbox_value( - w, WIDX_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, gConfigGeneral.allow_loading_with_incorrect_checksum); - widget_set_checkbox_value(w, WIDX_SAVE_PLUGIN_DATA_CHECKBOX, gConfigGeneral.save_plugin_data); - widget_set_checkbox_value(w, WIDX_STAY_CONNECTED_AFTER_DESYNC, gConfigNetwork.stay_connected); - widget_set_checkbox_value(w, WIDX_ALWAYS_NATIVE_LOADSAVE, gConfigGeneral.use_native_browse_dialog); + WidgetSetCheckboxValue(w, WIDX_DEBUGGING_TOOLS, gConfigGeneral.debugging_tools); + WidgetSetCheckboxValue(w, WIDX_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, gConfigGeneral.allow_loading_with_incorrect_checksum); + WidgetSetCheckboxValue(w, WIDX_SAVE_PLUGIN_DATA_CHECKBOX, gConfigGeneral.save_plugin_data); + WidgetSetCheckboxValue(w, WIDX_STAY_CONNECTED_AFTER_DESYNC, gConfigNetwork.stay_connected); + WidgetSetCheckboxValue(w, WIDX_ALWAYS_NATIVE_LOADSAVE, gConfigGeneral.use_native_browse_dialog); window_options_common_invalidate_after(w); } diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 3e961ac5b9ba..d8344d0a7978 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -636,9 +636,9 @@ static void window_park_entrance_invalidate(rct_window* w) } window_park_entrance_widgets[WIDX_OPEN_OR_CLOSE].image = park_is_open() ? SPR_OPEN : SPR_CLOSED; window_park_entrance_widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + !park_is_open() * 2 - + widget_is_pressed(w, WIDX_CLOSE_LIGHT); + + WidgetIsPressed(w, WIDX_CLOSE_LIGHT); window_park_entrance_widgets[WIDX_OPEN_LIGHT].image = SPR_G2_RCT1_OPEN_BUTTON_0 + park_is_open() * 2 - + widget_is_pressed(w, WIDX_OPEN_LIGHT); + + WidgetIsPressed(w, WIDX_OPEN_LIGHT); // Only allow closing of park for guest / rating objective if (gScenarioObjective.Type == OBJECTIVE_GUESTS_AND_RATING) diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 518e5f00643c..60c5cd464107 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -431,7 +431,7 @@ void window_player_overview_invalidate(rct_window* w) const bool canKick = network_can_perform_action(network_get_current_player_group_index(), NetworkPermission::KickPlayer); const bool isServer = network_get_player_flags(playerIndex) & NETWORK_PLAYER_FLAG_ISSERVER; const bool isOwnWindow = (network_get_current_player_id() == w->number); - widget_set_enabled(w, WIDX_KICK, canKick && !isOwnWindow && !isServer); + WidgetSetEnabled(w, WIDX_KICK, canKick && !isOwnWindow && !isServer); } void window_player_statistics_close(rct_window* w) @@ -571,7 +571,7 @@ static void window_player_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w) int32_t imageId; // Tab 1 - if (!widget_is_disabled(w, WIDX_TAB_1)) + if (!WidgetIsDisabled(w, WIDX_TAB_1)) { widget = &w->widgets[WIDX_TAB_1]; auto screenCoords = w->windowPos + ScreenCoordsXY{ widget->left, widget->top }; @@ -580,7 +580,7 @@ static void window_player_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w) } // Tab 2 - if (!widget_is_disabled(w, WIDX_TAB_2)) + if (!WidgetIsDisabled(w, WIDX_TAB_2)) { widget = &w->widgets[WIDX_TAB_2]; auto screenCoords = w->windowPos + ScreenCoordsXY{ widget->left, widget->top }; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 120f75513319..3ddcaf43e014 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -2375,22 +2375,22 @@ static void window_ride_main_invalidate(rct_window* w) #ifdef __SIMULATE_IN_RIDE_WINDOW__ window_ride_main_widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RIDE_STATUS_CLOSED) * 2 - + widget_is_pressed(w, WIDX_CLOSE_LIGHT); + + WidgetIsPressed(w, WIDX_CLOSE_LIGHT); window_ride_main_widgets[WIDX_SIMULATE_LIGHT].image = SPR_G2_RCT1_SIMULATE_BUTTON_0 - + (ride->status == RIDE_STATUS_SIMULATING) * 2 + widget_is_pressed(w, WIDX_SIMULATE_LIGHT); + + (ride->status == RIDE_STATUS_SIMULATING) * 2 + WidgetIsPressed(w, WIDX_SIMULATE_LIGHT); window_ride_main_widgets[WIDX_TEST_LIGHT].image = SPR_G2_RCT1_TEST_BUTTON_0 + (ride->status == RIDE_STATUS_TESTING) * 2 - + widget_is_pressed(w, WIDX_TEST_LIGHT); + + WidgetIsPressed(w, WIDX_TEST_LIGHT); #else window_ride_main_widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RIDE_STATUS_CLOSED) * 2 - + widget_is_pressed(w, WIDX_CLOSE_LIGHT); + + WidgetIsPressed(w, WIDX_CLOSE_LIGHT); auto baseSprite = ride->status == RIDE_STATUS_SIMULATING ? SPR_G2_RCT1_SIMULATE_BUTTON_0 : SPR_G2_RCT1_TEST_BUTTON_0; window_ride_main_widgets[WIDX_TEST_LIGHT].image = baseSprite + (ride->status == RIDE_STATUS_TESTING || ride->status == RIDE_STATUS_SIMULATING) * 2 - + widget_is_pressed(w, WIDX_TEST_LIGHT); + + WidgetIsPressed(w, WIDX_TEST_LIGHT); #endif window_ride_main_widgets[WIDX_OPEN_LIGHT].image = SPR_G2_RCT1_OPEN_BUTTON_0 + (ride->status == RIDE_STATUS_OPEN) * 2 - + widget_is_pressed(w, WIDX_OPEN_LIGHT); + + WidgetIsPressed(w, WIDX_OPEN_LIGHT); window_ride_anchor_border_widgets(w); @@ -5842,7 +5842,7 @@ static void window_ride_graphs_update(rct_window* w) } w->scrolls[0].h_left = std::clamp(x, 0, w->scrolls[0].h_right - (widget->width() - 2)); - widget_scroll_update_thumbs(w, WIDX_GRAPH); + WidgetScrollUpdateThumbs(w, WIDX_GRAPH); } /** diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index a38d8d6ee5fe..d8d61c235c02 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2055,7 +2055,7 @@ static void window_ride_construction_update(rct_window* w) if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_PLACE) { - if (!widget_is_active_tool(w, WIDX_CONSTRUCT)) + if (!WidgetIsActiveTool(w, WIDX_CONSTRUCT)) { window_close(w); return; @@ -2064,7 +2064,7 @@ static void window_ride_construction_update(rct_window* w) if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT) { - if (!widget_is_active_tool(w, WIDX_ENTRANCE) && !widget_is_active_tool(w, WIDX_EXIT)) + if (!WidgetIsActiveTool(w, WIDX_ENTRANCE) && !WidgetIsActiveTool(w, WIDX_EXIT)) { _rideConstructionState = gRideEntranceExitPlacePreviousRideConstructionState; window_ride_construction_update_active_elements(); @@ -3921,7 +3921,7 @@ static void ride_construction_tooldown_entrance_exit(const ScreenCoordsXY& scree void window_ride_construction_keyboard_shortcut_turn_left() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) { return; } @@ -3929,18 +3929,18 @@ void window_ride_construction_keyboard_shortcut_turn_left() switch (_currentTrackCurve) { case TRACK_CURVE_LEFT_SMALL: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } break; case TRACK_CURVE_LEFT: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3950,16 +3950,16 @@ void window_ride_construction_keyboard_shortcut_turn_left() } break; case TRACK_CURVE_LEFT_LARGE: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3969,20 +3969,20 @@ void window_ride_construction_keyboard_shortcut_turn_left() } break; case TRACK_CURVE_NONE: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -3992,24 +3992,24 @@ void window_ride_construction_keyboard_shortcut_turn_left() } break; case TRACK_CURVE_RIGHT_LARGE: - if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -4019,28 +4019,28 @@ void window_ride_construction_keyboard_shortcut_turn_left() } break; case TRACK_CURVE_RIGHT: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -4050,32 +4050,32 @@ void window_ride_construction_keyboard_shortcut_turn_left() } break; case TRACK_CURVE_RIGHT_SMALL: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -4085,36 +4085,36 @@ void window_ride_construction_keyboard_shortcut_turn_left() } break; case TRACK_CURVE_RIGHT_VERY_SMALL: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_VERY_SMALL); } @@ -4131,7 +4131,7 @@ void window_ride_construction_keyboard_shortcut_turn_left() void window_ride_construction_keyboard_shortcut_turn_right() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) { return; } @@ -4139,20 +4139,18 @@ void window_ride_construction_keyboard_shortcut_turn_right() switch (_currentTrackCurve) { case TRACK_CURVE_RIGHT_SMALL: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } break; case TRACK_CURVE_RIGHT: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4162,17 +4160,16 @@ void window_ride_construction_keyboard_shortcut_turn_right() } break; case TRACK_CURVE_RIGHT_LARGE: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4182,21 +4179,20 @@ void window_ride_construction_keyboard_shortcut_turn_right() } break; case TRACK_CURVE_NONE: - if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4206,25 +4202,24 @@ void window_ride_construction_keyboard_shortcut_turn_right() } break; case TRACK_CURVE_LEFT_LARGE: - if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4234,29 +4229,28 @@ void window_ride_construction_keyboard_shortcut_turn_right() } break; case TRACK_CURVE_LEFT: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4266,33 +4260,32 @@ void window_ride_construction_keyboard_shortcut_turn_right() } break; case TRACK_CURVE_LEFT_SMALL: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4302,37 +4295,36 @@ void window_ride_construction_keyboard_shortcut_turn_right() } break; case TRACK_CURVE_LEFT_VERY_SMALL: - if (!widget_is_disabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_SMALL); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE); } - else if (!widget_is_disabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEFT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_LARGE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE); } - else if (!widget_is_disabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_SMALL); } else if ( - !widget_is_disabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) - && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) + !WidgetIsDisabled(w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_RIGHT_CURVE_VERY_SMALL); } @@ -4349,28 +4341,28 @@ void window_ride_construction_keyboard_shortcut_turn_right() void window_ride_construction_keyboard_shortcut_use_track_default() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) { return; } - if (!widget_is_disabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_STRAIGHT); } - if (!widget_is_disabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEVEL); } - if (!widget_is_disabled(w, WIDX_CHAIN_LIFT) && w->widgets[WIDX_CHAIN_LIFT].type != WWT_EMPTY + if (!WidgetIsDisabled(w, WIDX_CHAIN_LIFT) && w->widgets[WIDX_CHAIN_LIFT].type != WWT_EMPTY && _currentTrackLiftHill & CONSTRUCTION_LIFT_HILL_SELECTED) { window_event_mouse_down_call(w, WIDX_CHAIN_LIFT); } - if (!widget_is_disabled(w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_STRAIGHT); } @@ -4379,7 +4371,7 @@ void window_ride_construction_keyboard_shortcut_use_track_default() void window_ride_construction_keyboard_shortcut_slope_down() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) { return; } @@ -4387,17 +4379,17 @@ void window_ride_construction_keyboard_shortcut_slope_down() switch (_currentTrackSlopeEnd) { case TRACK_SLOPE_DOWN_25: - if (!widget_is_disabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN_STEEP); } break; case TRACK_SLOPE_NONE: - if (!widget_is_disabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN); } - else if (!widget_is_disabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN_STEEP); } @@ -4407,15 +4399,15 @@ void window_ride_construction_keyboard_shortcut_slope_down() } break; case TRACK_SLOPE_UP_25: - if (!widget_is_disabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEVEL); } - else if (!widget_is_disabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN); } - else if (!widget_is_disabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN_STEEP); } @@ -4425,19 +4417,19 @@ void window_ride_construction_keyboard_shortcut_slope_down() } break; case TRACK_SLOPE_UP_60: - if (!widget_is_disabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP); } - else if (!widget_is_disabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEVEL); } - else if (!widget_is_disabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN); } - else if (!widget_is_disabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN_STEEP); } @@ -4454,7 +4446,7 @@ void window_ride_construction_keyboard_shortcut_slope_down() void window_ride_construction_keyboard_shortcut_slope_up() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WWT_EMPTY) { return; } @@ -4462,17 +4454,17 @@ void window_ride_construction_keyboard_shortcut_slope_up() switch (_currentTrackSlopeEnd) { case TRACK_SLOPE_UP_25: - if (!widget_is_disabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP_STEEP); } break; case TRACK_SLOPE_NONE: - if (!widget_is_disabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP); } - else if (!widget_is_disabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP_STEEP); } @@ -4482,15 +4474,15 @@ void window_ride_construction_keyboard_shortcut_slope_up() } break; case TRACK_SLOPE_DOWN_25: - if (!widget_is_disabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEVEL); } - else if (!widget_is_disabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP); } - else if (!widget_is_disabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP_STEEP); } @@ -4500,19 +4492,19 @@ void window_ride_construction_keyboard_shortcut_slope_up() } break; case TRACK_SLOPE_DOWN_60: - if (!widget_is_disabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_DOWN); } - else if (!widget_is_disabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_LEVEL); } - else if (!widget_is_disabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP); } - else if (!widget_is_disabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_SLOPE_UP_STEEP); } @@ -4529,7 +4521,7 @@ void window_ride_construction_keyboard_shortcut_slope_up() void window_ride_construction_keyboard_shortcut_chain_lift_toggle() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_CHAIN_LIFT) || w->widgets[WIDX_CHAIN_LIFT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_CHAIN_LIFT) || w->widgets[WIDX_CHAIN_LIFT].type == WWT_EMPTY) { return; } @@ -4540,7 +4532,7 @@ void window_ride_construction_keyboard_shortcut_chain_lift_toggle() void window_ride_construction_keyboard_shortcut_bank_left() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_BANK_STRAIGHT) || w->widgets[WIDX_BANK_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_BANK_STRAIGHT) || w->widgets[WIDX_BANK_STRAIGHT].type == WWT_EMPTY) { return; } @@ -4548,17 +4540,17 @@ void window_ride_construction_keyboard_shortcut_bank_left() switch (_currentTrackBankEnd) { case TRACK_BANK_NONE: - if (!widget_is_disabled(w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_LEFT); } break; case TRACK_BANK_RIGHT: - if (!widget_is_disabled(w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_LEFT); } @@ -4575,7 +4567,7 @@ void window_ride_construction_keyboard_shortcut_bank_left() void window_ride_construction_keyboard_shortcut_bank_right() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_BANK_STRAIGHT) || w->widgets[WIDX_BANK_STRAIGHT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_BANK_STRAIGHT) || w->widgets[WIDX_BANK_STRAIGHT].type == WWT_EMPTY) { return; } @@ -4583,17 +4575,17 @@ void window_ride_construction_keyboard_shortcut_bank_right() switch (_currentTrackBankEnd) { case TRACK_BANK_NONE: - if (!widget_is_disabled(w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_RIGHT); } break; case TRACK_BANK_LEFT: - if (!widget_is_disabled(w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WWT_EMPTY) + if (!WidgetIsDisabled(w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_STRAIGHT); } - else if (!widget_is_disabled(w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WWT_EMPTY) + else if (!WidgetIsDisabled(w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WWT_EMPTY) { window_event_mouse_down_call(w, WIDX_BANK_RIGHT); } @@ -4610,7 +4602,7 @@ void window_ride_construction_keyboard_shortcut_bank_right() void window_ride_construction_keyboard_shortcut_previous_track() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_PREVIOUS_SECTION) || w->widgets[WIDX_PREVIOUS_SECTION].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_PREVIOUS_SECTION) || w->widgets[WIDX_PREVIOUS_SECTION].type == WWT_EMPTY) { return; } @@ -4621,7 +4613,7 @@ void window_ride_construction_keyboard_shortcut_previous_track() void window_ride_construction_keyboard_shortcut_next_track() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_NEXT_SECTION) || w->widgets[WIDX_NEXT_SECTION].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_NEXT_SECTION) || w->widgets[WIDX_NEXT_SECTION].type == WWT_EMPTY) { return; } @@ -4632,7 +4624,7 @@ void window_ride_construction_keyboard_shortcut_next_track() void window_ride_construction_keyboard_shortcut_build_current() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WWT_EMPTY) { return; } @@ -4643,7 +4635,7 @@ void window_ride_construction_keyboard_shortcut_build_current() void window_ride_construction_keyboard_shortcut_demolish_current() { rct_window* w = window_find_by_class(WC_RIDE_CONSTRUCTION); - if (w == nullptr || widget_is_disabled(w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WWT_EMPTY) + if (w == nullptr || WidgetIsDisabled(w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WWT_EMPTY) { return; } diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 6a86ca32145a..4ec199bd058a 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -533,9 +533,9 @@ static void window_ride_list_invalidate(rct_window* w) } w->widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (allClosed ? 1 : 0) * 2 - + widget_is_pressed(w, WIDX_CLOSE_LIGHT); + + WidgetIsPressed(w, WIDX_CLOSE_LIGHT); w->widgets[WIDX_OPEN_LIGHT].image = SPR_G2_RCT1_OPEN_BUTTON_0 + (allOpen ? 1 : 0) * 2 - + widget_is_pressed(w, WIDX_OPEN_LIGHT); + + WidgetIsPressed(w, WIDX_OPEN_LIGHT); w->widgets[WIDX_QUICK_DEMOLISH].top = w->widgets[WIDX_OPEN_LIGHT].bottom + 3; } else diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 9a3d7e74ed20..eead9de7726c 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -626,7 +626,7 @@ void window_scenery_update_scroll(rct_window* w) w->scrolls[0].v_top = window_scenery_rows_height(rowSelected); w->scrolls[0].v_top = std::min(maxTop, w->scrolls[0].v_top); - widget_scroll_update_thumbs(w, WIDX_SCENERY_LIST); + WidgetScrollUpdateThumbs(w, WIDX_SCENERY_LIST); } /** diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 313e6b5fc72b..8bf6fb5d8b2b 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -309,7 +309,7 @@ static void window_server_start_invalidate(rct_window* w) { ColourSchemeUpdateByClass(w, WC_SERVER_LIST); - widget_set_checkbox_value(w, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.advertise); + WidgetSetCheckboxValue(w, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.advertise); auto ft = Formatter::Common(); ft.Increment(18); ft.Add(gConfigNetwork.maxplayers); diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index b070f5d3d8fb..2e2290b2dd5a 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -786,11 +786,11 @@ void window_themes_invalidate(rct_window* w) window_themes_widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WWT_EMPTY; window_themes_widgets[WIDX_THEMES_COLOURBTN_MASK].type = WWT_EMPTY; - widget_set_checkbox_value(w, WIDX_THEMES_RCT1_RIDE_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE); - widget_set_checkbox_value(w, WIDX_THEMES_RCT1_PARK_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_PARK); - widget_set_checkbox_value( + WidgetSetCheckboxValue(w, WIDX_THEMES_RCT1_RIDE_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE); + WidgetSetCheckboxValue(w, WIDX_THEMES_RCT1_PARK_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_PARK); + WidgetSetCheckboxValue( w, WIDX_THEMES_RCT1_SCENARIO_FONT, ThemeGetFlags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT); - widget_set_checkbox_value(w, WIDX_THEMES_RCT1_BOTTOM_TOOLBAR, ThemeGetFlags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR); + WidgetSetCheckboxValue(w, WIDX_THEMES_RCT1_BOTTOM_TOOLBAR, ThemeGetFlags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR); } else { diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 7fc36d53c5c8..88f541039b65 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -875,7 +875,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI break; case WIDX_TRACK_CHECK_CHAIN_LIFT: { - bool entireTrackBlock = widget_is_pressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL); + bool entireTrackBlock = WidgetIsPressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL); bool newLift = !tileElement->AsTrack()->HasChain(); window_tile_inspector_track_block_set_lift(windowTileInspectorSelectedIndex, entireTrackBlock, newLift); break; @@ -1022,7 +1022,7 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge switch (widgetIndex) { case WIDX_TRACK_SPINNER_HEIGHT_INCREASE: - if (widget_is_pressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL)) + if (WidgetIsPressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL)) { window_tile_inspector_track_block_height_offset(windowTileInspectorSelectedIndex, 1); } @@ -1032,7 +1032,7 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge } break; case WIDX_TRACK_SPINNER_HEIGHT_DECREASE: - if (widget_is_pressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL)) + if (WidgetIsPressed(w, WIDX_TRACK_CHECK_APPLY_TO_ALL)) { window_tile_inspector_track_block_height_offset(windowTileInspectorSelectedIndex, -1); } @@ -1150,7 +1150,7 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge static void window_tile_inspector_update(rct_window* w) { // Check if the mouse is hovering over the list - if (!widget_is_highlighted(w, WIDX_LIST)) + if (!WidgetIsHighlighted(w, WIDX_LIST)) { windowTileInspectorHighlightedIndex = -1; widget_invalidate(w, WIDX_LIST); @@ -1385,36 +1385,36 @@ static void window_tile_inspector_invalidate(rct_window* w) } // X and Y spinners - widget_set_enabled( + WidgetSetEnabled( w, WIDX_SPINNER_X_INCREASE, (windowTileInspectorTileSelected && ((windowTileInspectorToolMap.x / 32) < MAXIMUM_MAP_SIZE_TECHNICAL - 1))); - widget_set_enabled( + WidgetSetEnabled( w, WIDX_SPINNER_X_DECREASE, (windowTileInspectorTileSelected && ((windowTileInspectorToolMap.x / 32) > 0))); - widget_set_enabled( + WidgetSetEnabled( w, WIDX_SPINNER_Y_INCREASE, (windowTileInspectorTileSelected && ((windowTileInspectorToolMap.y / 32) < MAXIMUM_MAP_SIZE_TECHNICAL - 1))); - widget_set_enabled( + WidgetSetEnabled( w, WIDX_SPINNER_Y_DECREASE, (windowTileInspectorTileSelected && ((windowTileInspectorToolMap.y / 32) > 0))); // Sort buttons - widget_set_enabled(w, WIDX_BUTTON_SORT, (windowTileInspectorTileSelected && windowTileInspectorElementCount > 1)); + WidgetSetEnabled(w, WIDX_BUTTON_SORT, (windowTileInspectorTileSelected && windowTileInspectorElementCount > 1)); // Move Up button - widget_set_enabled( + WidgetSetEnabled( w, WIDX_BUTTON_MOVE_UP, (windowTileInspectorSelectedIndex != -1 && windowTileInspectorSelectedIndex < windowTileInspectorElementCount - 1)); widget_invalidate(w, WIDX_BUTTON_MOVE_UP); // Move Down button - widget_set_enabled(w, WIDX_BUTTON_MOVE_DOWN, (windowTileInspectorSelectedIndex > 0)); + WidgetSetEnabled(w, WIDX_BUTTON_MOVE_DOWN, (windowTileInspectorSelectedIndex > 0)); widget_invalidate(w, WIDX_BUTTON_MOVE_DOWN); // Copy button - widget_set_enabled(w, WIDX_BUTTON_COPY, windowTileInspectorSelectedIndex >= 0); + WidgetSetEnabled(w, WIDX_BUTTON_COPY, windowTileInspectorSelectedIndex >= 0); widget_invalidate(w, WIDX_BUTTON_COPY); // Paste button - widget_set_enabled(w, WIDX_BUTTON_PASTE, windowTileInspectorTileSelected && windowTileInspectorElementCopied); + WidgetSetEnabled(w, WIDX_BUTTON_PASTE, windowTileInspectorTileSelected && windowTileInspectorElementCopied); widget_invalidate(w, WIDX_BUTTON_PASTE); w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; @@ -1471,19 +1471,19 @@ static void window_tile_inspector_invalidate(rct_window* w) w->widgets[WIDX_SURFACE_CHECK_CORNER_W].bottom = w->widgets[WIDX_SURFACE_CHECK_CORNER_W].top + 13; w->widgets[WIDX_SURFACE_CHECK_DIAGONAL].top = GBBT(propertiesAnchor, 3) + 7 * 1; w->widgets[WIDX_SURFACE_CHECK_DIAGONAL].bottom = w->widgets[WIDX_SURFACE_CHECK_DIAGONAL].top + 13; - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_SURFACE_CHECK_CORNER_N, tileElement->AsSurface()->GetSlope() & (1 << ((2 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_SURFACE_CHECK_CORNER_E, tileElement->AsSurface()->GetSlope() & (1 << ((3 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_SURFACE_CHECK_CORNER_S, tileElement->AsSurface()->GetSlope() & (1 << ((0 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_SURFACE_CHECK_CORNER_W, tileElement->AsSurface()->GetSlope() & (1 << ((1 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_SURFACE_CHECK_DIAGONAL, tileElement->AsSurface()->GetSlope() & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT); break; case TILE_INSPECTOR_PAGE_PATH: @@ -1513,23 +1513,23 @@ static void window_tile_inspector_invalidate(rct_window* w) w->widgets[WIDX_PATH_CHECK_EDGE_W].bottom = w->widgets[WIDX_PATH_CHECK_EDGE_W].top + 13; w->widgets[WIDX_PATH_CHECK_EDGE_NW].top = GBBT(propertiesAnchor, 3) + 7 * 1; w->widgets[WIDX_PATH_CHECK_EDGE_NW].bottom = w->widgets[WIDX_PATH_CHECK_EDGE_NW].top + 13; - widget_set_checkbox_value(w, WIDX_PATH_CHECK_SLOPED, tileElement->AsPath()->IsSloped()); - widget_set_checkbox_value(w, WIDX_PATH_CHECK_BROKEN, tileElement->AsPath()->IsBroken()); - widget_set_checkbox_value( + WidgetSetCheckboxValue(w, WIDX_PATH_CHECK_SLOPED, tileElement->AsPath()->IsSloped()); + WidgetSetCheckboxValue(w, WIDX_PATH_CHECK_BROKEN, tileElement->AsPath()->IsBroken()); + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_NE, tileElement->AsPath()->GetEdges() & (1 << ((0 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_SE, tileElement->AsPath()->GetEdges() & (1 << ((1 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_SW, tileElement->AsPath()->GetEdges() & (1 << ((2 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_NW, tileElement->AsPath()->GetEdges() & (1 << ((3 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_E, tileElement->AsPath()->GetCorners() & (1 << ((0 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_S, tileElement->AsPath()->GetCorners() & (1 << ((1 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_W, tileElement->AsPath()->GetCorners() & (1 << ((2 - get_current_rotation()) & 3))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_PATH_CHECK_EDGE_N, tileElement->AsPath()->GetCorners() & (1 << ((3 - get_current_rotation()) & 3))); break; case TILE_INSPECTOR_PAGE_TRACK: @@ -1547,10 +1547,10 @@ static void window_tile_inspector_invalidate(rct_window* w) w->widgets[WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED].bottom = GBBB(propertiesAnchor, 3); w->widgets[WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE].top = GBBT(propertiesAnchor, 4); w->widgets[WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE].bottom = GBBB(propertiesAnchor, 4); - widget_set_checkbox_value(w, WIDX_TRACK_CHECK_APPLY_TO_ALL, windowTileInspectorApplyToAll); - widget_set_checkbox_value(w, WIDX_TRACK_CHECK_CHAIN_LIFT, tileElement->AsTrack()->HasChain()); - widget_set_checkbox_value(w, WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED, tileElement->AsTrack()->BlockBrakeClosed()); - widget_set_checkbox_value(w, WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE, tileElement->AsTrack()->IsIndestructible()); + WidgetSetCheckboxValue(w, WIDX_TRACK_CHECK_APPLY_TO_ALL, windowTileInspectorApplyToAll); + WidgetSetCheckboxValue(w, WIDX_TRACK_CHECK_CHAIN_LIFT, tileElement->AsTrack()->HasChain()); + WidgetSetCheckboxValue(w, WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED, tileElement->AsTrack()->BlockBrakeClosed()); + WidgetSetCheckboxValue(w, WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE, tileElement->AsTrack()->IsIndestructible()); break; case TILE_INSPECTOR_PAGE_SCENERY: { @@ -1576,10 +1576,10 @@ static void window_tile_inspector_invalidate(rct_window* w) bool E = tileElement->AsSmallScenery()->GetSceneryQuadrant() == ((1 - get_current_rotation()) & 3); bool S = tileElement->AsSmallScenery()->GetSceneryQuadrant() == ((2 - get_current_rotation()) & 3); bool W = tileElement->AsSmallScenery()->GetSceneryQuadrant() == ((3 - get_current_rotation()) & 3); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_N, N); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_E, E); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_S, S); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_W, W); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_QUARTER_N, N); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_QUARTER_E, E); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_QUARTER_S, S); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_QUARTER_W, W); // Collision checkboxes w->widgets[WIDX_SCENERY_CHECK_COLLISION_N].top = GBBT(propertiesAnchor, 2) + 5 + 7 * 0; @@ -1595,10 +1595,10 @@ static void window_tile_inspector_invalidate(rct_window* w) E = (occupiedQuadrants & (1 << ((3 - get_current_rotation()) & 3))) != 0; S = (occupiedQuadrants & (1 << ((0 - get_current_rotation()) & 3))) != 0; W = (occupiedQuadrants & (1 << ((1 - get_current_rotation()) & 3))) != 0; - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_COLLISION_N, N); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_COLLISION_E, E); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_COLLISION_S, S); - widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_COLLISION_W, W); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_COLLISION_N, N); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_COLLISION_E, E); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_COLLISION_S, S); + WidgetSetCheckboxValue(w, WIDX_SCENERY_CHECK_COLLISION_W, W); break; } case TILE_INSPECTOR_PAGE_ENTRANCE: @@ -1610,7 +1610,7 @@ static void window_tile_inspector_invalidate(rct_window* w) w->widgets[WIDX_ENTRANCE_SPINNER_HEIGHT_DECREASE].bottom = GBBB(propertiesAnchor, 0) - 4; w->widgets[WIDX_ENTRANCE_BUTTON_MAKE_USABLE].top = GBBT(propertiesAnchor, 1); w->widgets[WIDX_ENTRANCE_BUTTON_MAKE_USABLE].bottom = GBBB(propertiesAnchor, 1); - widget_set_enabled( + WidgetSetEnabled( w, WIDX_ENTRANCE_BUTTON_MAKE_USABLE, tileElement->AsEntrance()->GetEntranceType() != ENTRANCE_TYPE_PARK_ENTRANCE); break; @@ -1638,14 +1638,14 @@ static void window_tile_inspector_invalidate(rct_window* w) const bool canBeSloped = !(wallEntry.flags & WALL_SCENERY_CANT_BUILD_ON_SLOPE); const bool hasAnimation = wallEntry.flags & WALL_SCENERY_IS_DOOR; // Wall slope dropdown - widget_set_enabled(w, WIDX_WALL_DROPDOWN_SLOPE, canBeSloped); + WidgetSetEnabled(w, WIDX_WALL_DROPDOWN_SLOPE, canBeSloped); widget_invalidate(w, WIDX_WALL_DROPDOWN_SLOPE); - widget_set_enabled(w, WIDX_WALL_DROPDOWN_SLOPE_BUTTON, canBeSloped); + WidgetSetEnabled(w, WIDX_WALL_DROPDOWN_SLOPE_BUTTON, canBeSloped); widget_invalidate(w, WIDX_WALL_DROPDOWN_SLOPE_BUTTON); // Wall animation frame spinner - widget_set_enabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME, hasAnimation); - widget_set_enabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME_INCREASE, hasAnimation); - widget_set_enabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME_DECREASE, hasAnimation); + WidgetSetEnabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME, hasAnimation); + WidgetSetEnabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME_INCREASE, hasAnimation); + WidgetSetEnabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME_DECREASE, hasAnimation); break; } case TILE_INSPECTOR_PAGE_LARGE_SCENERY: @@ -1671,16 +1671,16 @@ static void window_tile_inspector_invalidate(rct_window* w) w->widgets[WIDX_BANNER_CHECK_BLOCK_SW].bottom = GBBB(propertiesAnchor, 2); w->widgets[WIDX_BANNER_CHECK_BLOCK_NW].top = GBBT(propertiesAnchor, 1); w->widgets[WIDX_BANNER_CHECK_BLOCK_NW].bottom = GBBB(propertiesAnchor, 1); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_BANNER_CHECK_BLOCK_NE, !(tileElement->AsBanner()->GetAllowedEdges() & (1 << ((0 - get_current_rotation()) & 3)))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_BANNER_CHECK_BLOCK_SE, !(tileElement->AsBanner()->GetAllowedEdges() & (1 << ((1 - get_current_rotation()) & 3)))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_BANNER_CHECK_BLOCK_SW, !(tileElement->AsBanner()->GetAllowedEdges() & (1 << ((2 - get_current_rotation()) & 3)))); - widget_set_checkbox_value( + WidgetSetCheckboxValue( w, WIDX_BANNER_CHECK_BLOCK_NW, !(tileElement->AsBanner()->GetAllowedEdges() & (1 << ((3 - get_current_rotation()) & 3)))); break; @@ -2109,7 +2109,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) // Current animation frame uint8_t colour = COLOUR_WHITE; - if (widget_is_disabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME)) + if (WidgetIsDisabled(w, WIDX_WALL_SPINNER_ANIMATION_FRAME)) { colour = w->colours[0] | COLOUR_FLAG_INSET; } diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index f7f626529908..c81e312ae058 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -561,7 +561,7 @@ static void window_title_editor_update(rct_window* w) w->frame_no = 0; } - if (!widget_is_highlighted(w, WIDX_TITLE_EDITOR_LIST)) + if (!WidgetIsHighlighted(w, WIDX_TITLE_EDITOR_LIST)) { _window_title_editor_highlighted_index = -1; widget_invalidate(w, WIDX_TITLE_EDITOR_LIST); diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index 131ae04a1c86..4a24e3703ee0 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -87,7 +87,7 @@ rct_window* window_title_menu_open() int32_t x = 0; for (rct_widget* widget = window->widgets; widget != &window->widgets[WIDX_NEW_VERSION]; widget++) { - if (widget_is_enabled(window, i)) + if (WidgetIsEnabled(window, i)) { widget->left = x; widget->right = x + MenuButtonDims.width - 1; diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 15a3e8c78df1..6957140c0870 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -847,7 +847,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_STAFF].left, w->windowPos.y + window_top_toolbar_widgets[WIDX_STAFF].top }; imgId = SPR_TOOLBAR_STAFF; - if (widget_is_pressed(w, WIDX_STAFF)) + if (WidgetIsPressed(w, WIDX_STAFF)) imgId++; imgId |= SPRITE_ID_PALETTE_COLOUR_2(gStaffHandymanColour, gStaffMechanicColour); gfx_draw_sprite(dpi, imgId, screenPos, 0); @@ -858,7 +858,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) { screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_FASTFORWARD].left + 0, w->windowPos.y + window_top_toolbar_widgets[WIDX_FASTFORWARD].top + 0 }; - if (widget_is_pressed(w, WIDX_FASTFORWARD)) + if (WidgetIsPressed(w, WIDX_FASTFORWARD)) screenPos.y++; imgId = SPR_G2_FASTFORWARD; gfx_draw_sprite(dpi, imgId, screenPos + ScreenCoordsXY{ 6, 3 }, 0); @@ -879,7 +879,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_CHEATS].left - 1, window_top_toolbar_widgets[WIDX_CHEATS].top - 1 }; - if (widget_is_pressed(w, WIDX_CHEATS)) + if (WidgetIsPressed(w, WIDX_CHEATS)) screenPos.y++; imgId = SPR_G2_SANDBOX; gfx_draw_sprite(dpi, imgId, screenPos, 3); @@ -898,7 +898,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) { screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_CHAT].left, window_top_toolbar_widgets[WIDX_CHAT].top - 2 }; - if (widget_is_pressed(w, WIDX_CHAT)) + if (WidgetIsPressed(w, WIDX_CHAT)) screenPos.y++; imgId = SPR_G2_CHAT; gfx_draw_sprite(dpi, imgId, screenPos, 3); @@ -909,7 +909,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) { screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_DEBUG].left, window_top_toolbar_widgets[WIDX_DEBUG].top - 1 }; - if (widget_is_pressed(w, WIDX_DEBUG)) + if (WidgetIsPressed(w, WIDX_DEBUG)) screenPos.y++; imgId = SPR_TAB_GEARS_0; gfx_draw_sprite(dpi, imgId, screenPos, 3); @@ -921,7 +921,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_RESEARCH].left - 1, window_top_toolbar_widgets[WIDX_RESEARCH].top }; - if (widget_is_pressed(w, WIDX_RESEARCH)) + if (WidgetIsPressed(w, WIDX_RESEARCH)) screenPos.y++; imgId = SPR_TAB_FINANCES_RESEARCH_0; gfx_draw_sprite(dpi, imgId, screenPos, 0); @@ -933,7 +933,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_FINANCES].left + 3, window_top_toolbar_widgets[WIDX_FINANCES].top + 1 }; - if (widget_is_pressed(w, WIDX_FINANCES)) + if (WidgetIsPressed(w, WIDX_FINANCES)) screenPos.y++; imgId = SPR_FINANCE; gfx_draw_sprite(dpi, imgId, screenPos, 0); @@ -944,7 +944,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) { screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_NEWS].left + 3, window_top_toolbar_widgets[WIDX_NEWS].top + 0 }; - if (widget_is_pressed(w, WIDX_NEWS)) + if (WidgetIsPressed(w, WIDX_NEWS)) screenPos.y++; imgId = SPR_G2_TAB_NEWS; gfx_draw_sprite(dpi, imgId, screenPos, 0); @@ -956,7 +956,7 @@ static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) screenPos = w->windowPos + ScreenCoordsXY{ window_top_toolbar_widgets[WIDX_NETWORK].left + 3, window_top_toolbar_widgets[WIDX_NETWORK].top + 0 }; - if (widget_is_pressed(w, WIDX_NETWORK)) + if (WidgetIsPressed(w, WIDX_NETWORK)) screenPos.y++; // Draw (de)sync icon. diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 104dc3fcf5eb..44a0a1cea96b 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -357,12 +357,12 @@ static void window_view_clipping_tool_up(struct rct_window*, rct_widgetindex, co static void window_view_clipping_invalidate(rct_window* w) { - widget_scroll_update_thumbs(w, WIDX_CLIP_HEIGHT_SLIDER); + WidgetScrollUpdateThumbs(w, WIDX_CLIP_HEIGHT_SLIDER); rct_window* mainWindow = window_get_main(); if (mainWindow != nullptr) { - widget_set_checkbox_value(w, WIDX_CLIP_CHECKBOX_ENABLE, mainWindow->viewport->flags & VIEWPORT_FLAG_CLIP_VIEW); + WidgetSetCheckboxValue(w, WIDX_CLIP_CHECKBOX_ENABLE, mainWindow->viewport->flags & VIEWPORT_FLAG_CLIP_VIEW); } if (window_view_clipping_tool_is_active()) diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index d0493bcc6c9d..ee419e20c757 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -132,19 +132,19 @@ constexpr rct_widget MakeSpinnerIncreaseWidget( return MakeWidget({ xPos, yPos }, { width, height }, WWT_BUTTON, colour, STR_NUMERIC_UP, tooltip); } -void widget_scroll_update_thumbs(rct_window* w, rct_widgetindex widget_index); -void widget_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); - -bool widget_is_enabled(rct_window* w, rct_widgetindex widgetIndex); -bool widget_is_disabled(rct_window* w, rct_widgetindex widgetIndex); -bool widget_is_pressed(rct_window* w, rct_widgetindex widgetIndex); -bool widget_is_highlighted(rct_window* w, rct_widgetindex widgetIndex); -bool widget_is_active_tool(rct_window* w, rct_widgetindex widgetIndex); -void widget_scroll_get_part( +void WidgetScrollUpdateThumbs(rct_window* w, rct_widgetindex widget_index); +void WidgetDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); + +bool WidgetIsEnabled(rct_window* w, rct_widgetindex widgetIndex); +bool WidgetIsDisabled(rct_window* w, rct_widgetindex widgetIndex); +bool WidgetIsPressed(rct_window* w, rct_widgetindex widgetIndex); +bool WidgetIsHighlighted(rct_window* w, rct_widgetindex widgetIndex); +bool WidgetIsActiveTool(rct_window* w, rct_widgetindex widgetIndex); +void WidgetScrollGetPart( rct_window* w, rct_widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords, int32_t* output_scroll_area, int32_t* scroll_id); -void widget_set_enabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled); -void widget_set_checkbox_value(rct_window* w, rct_widgetindex widgetIndex, int32_t value); +void WidgetSetEnabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled); +void WidgetSetCheckboxValue(rct_window* w, rct_widgetindex widgetIndex, int32_t value); #endif diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 94b7f30cd820..e35e45a508db 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -610,7 +610,7 @@ void window_update_scroll_widgets(rct_window* w) if (scrollPositionChanged) { - widget_scroll_update_thumbs(w, widgetIndex); + WidgetScrollUpdateThumbs(w, widgetIndex); w->Invalidate(); } scrollIndex++; @@ -2119,7 +2119,7 @@ rct_windowclass window_get_classification(rct_window* window) * * rct2: 0x006EAF26 */ -void widget_scroll_update_thumbs(rct_window* w, rct_widgetindex widget_index) +void WidgetScrollUpdateThumbs(rct_window* w, rct_widgetindex widget_index) { rct_widget* widget = &w->widgets[widget_index]; rct_scroll* scroll = &w->scrolls[window_get_scroll_data_index(w, widget_index)];