diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index d3e4b8145b..3ed57095d3 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -226,7 +226,7 @@ namespace OpenRCT2 scroll.contentOffsetY = std::min(std::max(0, scroll.contentOffsetY + differentialCoords.y), size); } - WidgetScrollUpdateThumbs(*w, widgetIndex); + widgetScrollUpdateThumbs(*w, widgetIndex); auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByNumber(w->classification, w->number); @@ -651,7 +651,7 @@ namespace OpenRCT2 int32_t scroll_area, scroll_id; ScreenCoordsXY scrollCoords; scroll_id = 0; // safety - WidgetScrollGetPart(w, &widget, screenCoords, scrollCoords, &scroll_area, &scroll_id); + widgetScrollGetPart(w, &widget, screenCoords, scrollCoords, &scroll_area, &scroll_id); _currentScrollArea = scroll_area; _currentScrollIndex = scroll_id; @@ -704,7 +704,7 @@ namespace OpenRCT2 default: break; } - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateByNumber(w.classification, w.number); @@ -723,7 +723,7 @@ namespace OpenRCT2 } ScreenCoordsXY newScreenCoords; - WidgetScrollGetPart(w, &widget, screenCoords, newScreenCoords, &scroll_part, &scroll_id); + widgetScrollGetPart(w, &widget, screenCoords, newScreenCoords, &scroll_part, &scroll_id); if (_currentScrollArea == SCROLL_PART_HSCROLLBAR_THUMB) { @@ -808,7 +808,7 @@ namespace OpenRCT2 if (newLeft > x) newLeft = x; scroll.contentOffsetX = newLeft; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); windowMgr->InvalidateWidgetByNumber(w.classification, w.number, widgetIndex); } } @@ -848,7 +848,7 @@ namespace OpenRCT2 if (newTop > y) newTop = y; scroll.contentOffsetY = newTop; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); windowMgr->InvalidateWidgetByNumber(w.classification, w.number, widgetIndex); } } @@ -866,7 +866,7 @@ namespace OpenRCT2 scroll.flags |= HSCROLLBAR_LEFT_PRESSED; if (scroll.contentOffsetX >= 3) scroll.contentOffsetX -= 3; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); windowMgr->InvalidateWidgetByNumber(w.classification, w.number, widgetIndex); } } @@ -894,7 +894,7 @@ namespace OpenRCT2 newLeft = 0; if (scroll.contentOffsetX > newLeft) scroll.contentOffsetX = newLeft; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); windowMgr->InvalidateWidgetByNumber(w.classification, w.number, widgetIndex); } } @@ -912,7 +912,7 @@ namespace OpenRCT2 scroll.flags |= VSCROLLBAR_UP_PRESSED; if (scroll.contentOffsetY >= 3) scroll.contentOffsetY -= 3; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); windowMgr->InvalidateWidgetByNumber(w.classification, w.number, widgetIndex); } } @@ -940,7 +940,7 @@ namespace OpenRCT2 newTop = 0; if (scroll.contentOffsetY > newTop) scroll.contentOffsetY = newTop; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); windowMgr->InvalidateWidgetByNumber(w.classification, w.number, widgetIndex); } } @@ -972,7 +972,7 @@ namespace OpenRCT2 { int32_t scroll_part, scrollId; ScreenCoordsXY newScreenCoords; - WidgetScrollGetPart(*w, widget, screenCoords, newScreenCoords, &scroll_part, &scrollId); + widgetScrollGetPart(*w, widget, screenCoords, newScreenCoords, &scroll_part, &scrollId); if (scroll_part != SCROLL_PART_VIEW) WindowTooltipClose(); @@ -1122,7 +1122,7 @@ namespace OpenRCT2 case WidgetType::checkbox: case WidgetType::textBox: case WidgetType::custom: - if (!WidgetIsDisabled(*w, widgetIndex)) + if (!widgetIsDisabled(*w, widgetIndex)) { OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + widget.midX()); @@ -1193,7 +1193,7 @@ namespace OpenRCT2 { int32_t output_scroll_area, scroll_id; ScreenCoordsXY scrollCoords; - WidgetScrollGetPart( + widgetScrollGetPart( *window, &window->widgets[widgetId], screenCoords, scrollCoords, &output_scroll_area, &scroll_id); if (output_scroll_area != SCROLL_PART_VIEW) { @@ -1286,7 +1286,7 @@ namespace OpenRCT2 || widgetIndex != cursor_widgetIndex) break; - if (WidgetIsDisabled(*w, widgetIndex)) + if (widgetIsDisabled(*w, widgetIndex)) break; // If this variable is non-zero then its the last tick the mouse down event was fired. @@ -1304,7 +1304,7 @@ namespace OpenRCT2 // Handle click repeat, only start this when at least 16 ticks elapsed. if (clickRepeatsDelta >= kTicksUntilRepeats && (clickRepeatsDelta & kEventDelayInTicks) == 0) { - if (WidgetIsHoldable(*w, widgetIndex)) + if (widgetIsHoldable(*w, widgetIndex)) { w->OnMouseDown(widgetIndex); } @@ -1424,7 +1424,7 @@ namespace OpenRCT2 if (cursor_w_class != w->classification || cursor_w_number != w->number || widgetIndex != cursor_widgetIndex) break; - if (WidgetIsDisabled(*w, widgetIndex)) + if (widgetIsDisabled(*w, widgetIndex)) break; windowMgr->InvalidateWidgetByNumber(cursor_w_class, cursor_w_number, widgetIndex); @@ -1502,7 +1502,7 @@ namespace OpenRCT2 if (gTooltipCursor == screenCoords) { if (gCurrentRealTimeTicks >= _tooltipNotShownTimeout && w != nullptr && widgetIndex != kWidgetIndexNull - && WidgetIsVisible(*w, widgetIndex)) + && widgetIsVisible(*w, widgetIndex)) { gTooltipCloseTimeout = gCurrentRealTimeTicks + 8000; WindowTooltipOpen(w, widgetIndex, screenCoords); @@ -1523,7 +1523,7 @@ namespace OpenRCT2 if (w == nullptr || gTooltipWidget.window_classification != w->classification || gTooltipWidget.window_number != w->number || gTooltipWidget.widget_index != widgetIndex - || !WidgetIsVisible(*w, widgetIndex)) + || !widgetIsVisible(*w, widgetIndex)) { WindowTooltipClose(); } diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 22e72dce4c..96e1c3992b 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -91,7 +91,7 @@ static void ShortcutRotateConstructionObject() // Rotate scenery WindowBase* w = windowMgr->FindByClass(WindowClass::Scenery); - if (w != nullptr && !WidgetIsDisabled(*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 != WidgetType::empty) { w->OnMouseUp(WC_SCENERY__WIDX_SCENERY_ROTATE_OBJECTS_BUTTON); @@ -100,7 +100,7 @@ static void ShortcutRotateConstructionObject() // Rotate construction track piece w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w != nullptr && !WidgetIsDisabled(*w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) + if (w != nullptr && !widgetIsDisabled(*w, WC_RIDE_CONSTRUCTION__WIDX_ROTATE) && w->widgets[WC_RIDE_CONSTRUCTION__WIDX_ROTATE].type != WidgetType::empty) { // Check if building a maze... @@ -113,7 +113,7 @@ static void ShortcutRotateConstructionObject() // Rotate track design preview w = windowMgr->FindByClass(WindowClass::TrackDesignList); - if (w != nullptr && !WidgetIsDisabled(*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 != WidgetType::empty) { w->OnMouseUp(WC_TRACK_DESIGN_LIST__WIDX_ROTATE); @@ -122,7 +122,7 @@ static void ShortcutRotateConstructionObject() // Rotate track design placement w = windowMgr->FindByClass(WindowClass::TrackDesignPlace); - if (w != nullptr && !WidgetIsDisabled(*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 != WidgetType::empty) { w->OnMouseUp(WC_TRACK_DESIGN_PLACE__WIDX_ROTATE); @@ -131,7 +131,7 @@ static void ShortcutRotateConstructionObject() // Rotate park entrance w = windowMgr->FindByClass(WindowClass::EditorParkEntrance); - if (w != nullptr && !WidgetIsDisabled(*w, WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON) + if (w != nullptr && !widgetIsDisabled(*w, WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON) && w->widgets[WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON].type != WidgetType::empty) { w->OnMouseUp(WC_EDITOR_PARK_ENTRANCE__WIDX_ROTATE_ENTRANCE_BUTTON); @@ -140,7 +140,7 @@ static void ShortcutRotateConstructionObject() // Rotate selected element in tile inspector w = windowMgr->FindByClass(WindowClass::TileInspector); - if (w != nullptr && !WidgetIsDisabled(*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 != WidgetType::empty) { w->OnMouseUp(WC_TILE_INSPECTOR__WIDX_BUTTON_ROTATE); @@ -447,7 +447,7 @@ static void ShortcutOpenSceneryPicker() ToggleSceneryWindow(); window_scenery = windowMgr->FindByClass(WindowClass::Scenery); - if (window_scenery != nullptr && !WidgetIsDisabled(*window_scenery, WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON) + if (window_scenery != nullptr && !widgetIsDisabled(*window_scenery, WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON) && !gWindowSceneryEyedropperEnabled) { window_scenery->OnMouseUp(WC_SCENERY__WIDX_SCENERY_EYEDROPPER_BUTTON); @@ -479,7 +479,7 @@ static void TileInspectorMouseUp(WidgetIndex widgetIndex) { auto* windowMgr = GetWindowManager(); auto w = windowMgr->FindByClass(WindowClass::TileInspector); - if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WidgetType::empty) + if (w != nullptr && !widgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WidgetType::empty) { w->OnMouseUp(widgetIndex); } @@ -489,7 +489,7 @@ static void TileInspectorMouseDown(WidgetIndex widgetIndex) { auto* windowMgr = GetWindowManager(); auto w = windowMgr->FindByClass(WindowClass::TileInspector); - if (w != nullptr && !WidgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WidgetType::empty) + if (w != nullptr && !widgetIsDisabled(*w, widgetIndex) && w->widgets[widgetIndex].type != WidgetType::empty) { w->OnMouseDown(widgetIndex); } @@ -561,7 +561,7 @@ static void ShortcutIncreaseElementHeight() action = WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_INCREASE; break; } - if (action != -1 && !WidgetIsDisabled(*w, action) && w->widgets[action].type != WidgetType::empty) + if (action != -1 && !widgetIsDisabled(*w, action) && w->widgets[action].type != WidgetType::empty) w->OnMouseDown(action); return; } @@ -601,7 +601,7 @@ static void ShortcutDecreaseElementHeight() action = WC_TILE_INSPECTOR__WIDX_BANNER_SPINNER_HEIGHT_DECREASE; break; } - if (action != -1 && !WidgetIsDisabled(*w, action) && w->widgets[action].type != WidgetType::empty) + if (action != -1 && !widgetIsDisabled(*w, action) && w->widgets[action].type != WidgetType::empty) w->OnMouseDown(action); return; } diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 454217cc79..7a2705b28d 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -55,9 +55,9 @@ namespace OpenRCT2::Ui * * rct2: 0x006EB2A8 */ - void WidgetDraw(RenderTarget& rt, WindowBase& w, WidgetIndex widgetIndex) + void widgetDraw(RenderTarget& rt, WindowBase& w, WidgetIndex widgetIndex) { - const auto* widget = GetWidgetByIndex(w, widgetIndex); + const auto* widget = getWidgetByIndex(w, widgetIndex); if (widget == nullptr) { LOG_ERROR("Tried drawing an out-of-bounds widget index!"); @@ -198,7 +198,7 @@ namespace OpenRCT2::Ui w.windowPos + ScreenCoordsXY{ widget.right, widget.bottom } }; // Check if the button is pressed down - uint8_t press = WidgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; + uint8_t press = widgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; auto colour = w.colours[widget.colour]; @@ -230,7 +230,7 @@ namespace OpenRCT2::Ui if (widget.type == WidgetType::tab) { - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) return; if (widget.image.GetIndex() == kImageIndexUndefined) @@ -241,7 +241,7 @@ namespace OpenRCT2::Ui } // Draw widgets that aren't explicitly disabled. - if (!WidgetIsDisabled(w, widgetIndex)) + if (!widgetIsDisabled(w, widgetIndex)) { WidgetDrawImage(rt, w, widgetIndex); return; @@ -271,7 +271,7 @@ namespace OpenRCT2::Ui */ static void WidgetFlatButtonDraw(RenderTarget& rt, WindowBase& w, WidgetIndex widgetIndex) { - if (!WidgetIsDisabled(w, widgetIndex) && WidgetIsHighlighted(w, widgetIndex)) + if (!widgetIsDisabled(w, widgetIndex) && widgetIsHighlighted(w, widgetIndex)) { WidgetButtonDraw(rt, w, widgetIndex); return; @@ -287,7 +287,7 @@ namespace OpenRCT2::Ui auto colour = w.colours[widget.colour]; // Check if the button is pressed down - if (WidgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) + if (widgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) { // Dead code? if (static_cast(widget.image.GetIndex()) == -2) @@ -321,7 +321,7 @@ namespace OpenRCT2::Ui auto colour = w.colours[widget.colour]; // Border - uint8_t press = WidgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; + uint8_t press = widgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex) ? INSET_RECT_FLAG_BORDER_INSET : 0; GfxFillRectInset(rt, rect, colour, press); // Button caption @@ -349,7 +349,7 @@ namespace OpenRCT2::Ui auto colour = w.colours[widget.colour]; colour.setFlag(ColourFlag::translucent, false); - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) colour.setFlag(ColourFlag::inset, true); // Resolve the absolute ltrb @@ -393,7 +393,7 @@ namespace OpenRCT2::Ui return; auto colour = w.colours[widget.colour]; - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) colour.setFlag(ColourFlag::inset, true); // Resolve the absolute ltrb @@ -480,7 +480,7 @@ namespace OpenRCT2::Ui if (stringId != kStringIdNone) { auto colour = w.colours[widget.colour].withFlag(ColourFlag::translucent, false); - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) colour.setFlag(ColourFlag::inset, true); utf8 buffer[512] = { 0 }; @@ -593,7 +593,7 @@ namespace OpenRCT2::Ui uint8_t press = 0; if (w.flags & WF_10) press |= INSET_RECT_FLAG_FILL_MID_LIGHT; - if (WidgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) + if (widgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) press |= INSET_RECT_FLAG_BORDER_INSET; auto colour = w.colours[widget.colour]; @@ -606,7 +606,7 @@ namespace OpenRCT2::Ui topLeft = w.windowPos + ScreenCoordsXY{ widget.midX() - 1, std::max(widget.top, widget.midY() - 5) }; - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) colour.setFlag(ColourFlag::inset, true); DrawText(rt, topLeft, { colour, TextAlignment::CENTRE }, widget.string); @@ -631,13 +631,13 @@ namespace OpenRCT2::Ui // checkbox GfxFillRectInset(rt, { midLeft - ScreenCoordsXY{ 0, 5 }, midLeft + ScreenCoordsXY{ 9, 4 } }, colour, INSET_RECT_F_60); - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) { colour.setFlag(ColourFlag::inset, true); } // fill it when checkbox is pressed - if (WidgetIsPressed(w, widgetIndex)) + if (widgetIsPressed(w, widgetIndex)) { DrawText( rt, { midLeft - ScreenCoordsXY{ 0, 5 } }, { colour.withFlag(ColourFlag::translucent, false) }, @@ -830,11 +830,11 @@ namespace OpenRCT2::Ui auto screenCoords = w.windowPos + ScreenCoordsXY{ widget.left, widget.top }; if (widget.type == WidgetType::colourBtn || widget.type == WidgetType::trnBtn || widget.type == WidgetType::tab) - if (WidgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) + if (widgetIsPressed(w, widgetIndex) || isToolActive(w, widgetIndex)) image = image.WithIndexOffset(1); const auto colour = w.colours[widget.colour].colour; - if (WidgetIsDisabled(w, widgetIndex)) + if (widgetIsDisabled(w, widgetIndex)) { // Draw greyed out (light border bottom right shadow) auto mappedColour = ColourMapA[colour].lighter; @@ -860,26 +860,26 @@ namespace OpenRCT2::Ui } } - bool WidgetIsDisabled(const WindowBase& w, WidgetIndex widgetIndex) + bool widgetIsDisabled(const WindowBase& w, WidgetIndex widgetIndex) { if (w.classification == WindowClass::Custom) return w.widgets[widgetIndex].flags.has(WidgetFlag::isDisabled); return (w.disabled_widgets & (1LL << widgetIndex)) != 0; } - bool WidgetIsHoldable(const WindowBase& w, WidgetIndex widgetIndex) + bool widgetIsHoldable(const WindowBase& w, WidgetIndex widgetIndex) { if (w.classification == WindowClass::Custom) return w.widgets[widgetIndex].flags.has(WidgetFlag::isHoldable); return (w.hold_down_widgets & (1LL << widgetIndex)) != 0; } - bool WidgetIsVisible(const WindowBase& w, WidgetIndex widgetIndex) + bool widgetIsVisible(const WindowBase& w, WidgetIndex widgetIndex) { return w.widgets[widgetIndex].IsVisible(); } - bool WidgetIsPressed(const WindowBase& w, WidgetIndex widgetIndex) + bool widgetIsPressed(const WindowBase& w, WidgetIndex widgetIndex) { if (w.classification == WindowClass::Custom) { @@ -911,7 +911,7 @@ namespace OpenRCT2::Ui return false; } - bool WidgetIsHighlighted(const WindowBase& w, WidgetIndex widgetIndex) + bool widgetIsHighlighted(const WindowBase& w, WidgetIndex widgetIndex) { if (gHoverWidget.window_classification != w.classification) return false; @@ -932,7 +932,7 @@ namespace OpenRCT2::Ui * esi: w * edi: widget */ - void WidgetScrollGetPart( + void widgetScrollGetPart( WindowBase& w, const Widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords, int32_t* output_scroll_area, int32_t* scroll_id) { @@ -1042,7 +1042,7 @@ namespace OpenRCT2::Ui } } - Widget* GetWidgetByIndex(WindowBase& w, WidgetIndex widgetIndex) + Widget* getWidgetByIndex(WindowBase& w, WidgetIndex widgetIndex) { if (widgetIndex >= w.widgets.size()) { @@ -1054,7 +1054,7 @@ namespace OpenRCT2::Ui static void SafeSetWidgetFlag(WindowBase& w, WidgetIndex widgetIndex, WidgetFlag flag, bool value) { - Widget* widget = GetWidgetByIndex(w, widgetIndex); + Widget* widget = getWidgetByIndex(w, widgetIndex); if (widget == nullptr) { return; @@ -1063,12 +1063,12 @@ namespace OpenRCT2::Ui widget->flags.set(flag, value); } - void WidgetSetEnabled(WindowBase& w, WidgetIndex widgetIndex, bool enabled) + void widgetSetEnabled(WindowBase& w, WidgetIndex widgetIndex, bool enabled) { - WidgetSetDisabled(w, widgetIndex, !enabled); + widgetSetDisabled(w, widgetIndex, !enabled); } - void WidgetSetDisabled(WindowBase& w, WidgetIndex widgetIndex, bool value) + void widgetSetDisabled(WindowBase& w, WidgetIndex widgetIndex, bool value) { SafeSetWidgetFlag(w, widgetIndex, WidgetFlag::isDisabled, value); if (value) @@ -1081,7 +1081,7 @@ namespace OpenRCT2::Ui } } - void WidgetSetHoldable(WindowBase& w, WidgetIndex widgetIndex, bool value) + void widgetSetHoldable(WindowBase& w, WidgetIndex widgetIndex, bool value) { SafeSetWidgetFlag(w, widgetIndex, WidgetFlag::isHoldable, value); if (value) @@ -1094,12 +1094,12 @@ namespace OpenRCT2::Ui } } - void WidgetSetVisible(WindowBase& w, WidgetIndex widgetIndex, bool value) + void widgetSetVisible(WindowBase& w, WidgetIndex widgetIndex, bool value) { SafeSetWidgetFlag(w, widgetIndex, WidgetFlag::isHidden, !value); } - void WidgetSetPressed(WindowBase& w, WidgetIndex widgetIndex, bool value) + void widgetSetPressed(WindowBase& w, WidgetIndex widgetIndex, bool value) { SafeSetWidgetFlag(w, widgetIndex, WidgetFlag::isPressed, value); if (value) @@ -1108,9 +1108,9 @@ namespace OpenRCT2::Ui w.pressed_widgets &= ~(1uLL << widgetIndex); } - void WidgetSetCheckboxValue(WindowBase& w, WidgetIndex widgetIndex, bool value) + void widgetSetCheckboxValue(WindowBase& w, WidgetIndex widgetIndex, bool value) { - WidgetSetPressed(w, widgetIndex, value); + widgetSetPressed(w, widgetIndex, value); } static void WidgetTextBoxDraw(RenderTarget& rt, WindowBase& w, WidgetIndex widgetIndex) @@ -1216,7 +1216,7 @@ namespace OpenRCT2::Ui GfxFillRectInset(rt, { topLeft, bottomRight }, w.colours[1], INSET_RECT_FLAG_BORDER_INSET); } - ImageId GetColourButtonImage(colour_t colour) + ImageId getColourButtonImage(colour_t colour) { if (colour == COLOUR_INVISIBLE) { @@ -1228,7 +1228,7 @@ namespace OpenRCT2::Ui } } - void WidgetProgressBarSetNewPercentage(Widget& widget, uint8_t newPercentage) + void widgetProgressBarSetNewPercentage(Widget& widget, uint8_t newPercentage) { widget.content &= ~0xFF; widget.content |= newPercentage; @@ -1238,7 +1238,7 @@ namespace OpenRCT2::Ui * * rct2: 0x006EAF26 */ - void WidgetScrollUpdateThumbs(WindowBase& w, WidgetIndex widget_index) + void widgetScrollUpdateThumbs(WindowBase& w, WidgetIndex widget_index) { const auto& widget = w.widgets[widget_index]; auto& scroll = w.scrolls[WindowGetScrollDataIndex(w, widget_index)]; diff --git a/src/openrct2-ui/interface/Widget.h b/src/openrct2-ui/interface/Widget.h index fd0e8774b2..ff2670bb18 100644 --- a/src/openrct2-ui/interface/Widget.h +++ b/src/openrct2-ui/interface/Widget.h @@ -17,8 +17,8 @@ namespace OpenRCT2::Ui { - ImageId GetColourButtonImage(colour_t colour); - Widget* GetWidgetByIndex(WindowBase& w, WidgetIndex widgetIndex); + ImageId getColourButtonImage(colour_t colour); + Widget* getWidgetByIndex(WindowBase& w, WidgetIndex widgetIndex); constexpr uint32_t kWidgetContentEmpty = 0xFFFFFFFF; constexpr auto kBarBlink = (1u << 31); @@ -248,25 +248,25 @@ namespace OpenRCT2::Ui makeDropdownButtonWidget(origin, size, type, colour, content, tooltip)); }; - void WidgetDraw(RenderTarget& rt, WindowBase& w, WidgetIndex widgetIndex); + void widgetDraw(RenderTarget& rt, WindowBase& w, WidgetIndex widgetIndex); - bool WidgetIsDisabled(const WindowBase& w, WidgetIndex widgetIndex); - bool WidgetIsHoldable(const WindowBase& w, WidgetIndex widgetIndex); - bool WidgetIsVisible(const WindowBase& w, WidgetIndex widgetIndex); - bool WidgetIsPressed(const WindowBase& w, WidgetIndex widgetIndex); - bool WidgetIsHighlighted(const WindowBase& w, WidgetIndex widgetIndex); - void WidgetScrollGetPart( + bool widgetIsDisabled(const WindowBase& w, WidgetIndex widgetIndex); + bool widgetIsHoldable(const WindowBase& w, WidgetIndex widgetIndex); + bool widgetIsVisible(const WindowBase& w, WidgetIndex widgetIndex); + bool widgetIsPressed(const WindowBase& w, WidgetIndex widgetIndex); + bool widgetIsHighlighted(const WindowBase& w, WidgetIndex widgetIndex); + void widgetScrollGetPart( WindowBase& w, const Widget* widget, const ScreenCoordsXY& screenCoords, ScreenCoordsXY& retScreenCoords, int32_t* output_scroll_area, int32_t* scroll_id); - void WidgetSetEnabled(WindowBase& w, WidgetIndex widgetIndex, bool enabled); - void WidgetSetDisabled(WindowBase& w, WidgetIndex widgetIndex, bool value); - void WidgetSetHoldable(WindowBase& w, WidgetIndex widgetIndex, bool value); - void WidgetSetVisible(WindowBase& w, WidgetIndex widgetIndex, bool value); - void WidgetSetPressed(WindowBase& w, WidgetIndex widgetIndex, bool value); - void WidgetSetCheckboxValue(WindowBase& w, WidgetIndex widgetIndex, bool value); + void widgetSetEnabled(WindowBase& w, WidgetIndex widgetIndex, bool enabled); + void widgetSetDisabled(WindowBase& w, WidgetIndex widgetIndex, bool value); + void widgetSetHoldable(WindowBase& w, WidgetIndex widgetIndex, bool value); + void widgetSetVisible(WindowBase& w, WidgetIndex widgetIndex, bool value); + void widgetSetPressed(WindowBase& w, WidgetIndex widgetIndex, bool value); + void widgetSetCheckboxValue(WindowBase& w, WidgetIndex widgetIndex, bool value); - void WidgetProgressBarSetNewPercentage(Widget& widget, uint8_t newPercentage); + void widgetProgressBarSetNewPercentage(Widget& widget, uint8_t newPercentage); - void WidgetScrollUpdateThumbs(WindowBase& w, WidgetIndex widget_index); + void widgetScrollUpdateThumbs(WindowBase& w, WidgetIndex widget_index); } // namespace OpenRCT2::Ui diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 8074843bb7..5304a8e34d 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -111,7 +111,7 @@ namespace OpenRCT2 scroll.contentOffsetX = std::min(std::max(0, scroll.contentOffsetX + wheel), size); } - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateWidget(w, widgetIndex); @@ -247,7 +247,7 @@ namespace OpenRCT2 assert(targetWidgetIndex >= 0 && targetWidgetIndex < w.widgets.size()); - if (WidgetIsDisabled(w, targetWidgetIndex)) + if (widgetIsDisabled(w, targetWidgetIndex)) { return false; } @@ -341,7 +341,7 @@ namespace OpenRCT2 void Window::OnDrawWidget(WidgetIndex widgetIndex, RenderTarget& rt) { - WidgetDraw(rt, *this, widgetIndex); + widgetDraw(rt, *this, widgetIndex); } void Window::InitScrollWidgets() @@ -357,22 +357,22 @@ namespace OpenRCT2 bool Window::IsWidgetDisabled(WidgetIndex widgetIndex) const { - return WidgetIsDisabled(*this, widgetIndex); + return widgetIsDisabled(*this, widgetIndex); } bool Window::IsWidgetPressed(WidgetIndex widgetIndex) const { - return WidgetIsPressed(*this, widgetIndex); + return widgetIsPressed(*this, widgetIndex); } void Window::SetWidgetEnabled(WidgetIndex widgetIndex, bool value) { - WidgetSetEnabled(*this, widgetIndex, value); + widgetSetEnabled(*this, widgetIndex, value); } void Window::SetWidgetDisabled(WidgetIndex widgetIndex, bool value) { - WidgetSetDisabled(*this, widgetIndex, value); + widgetSetDisabled(*this, widgetIndex, value); } void Window::SetWidgetDisabledAndInvalidate(WidgetIndex widgetIndex, bool value) @@ -380,14 +380,14 @@ namespace OpenRCT2 bool oldState = IsWidgetDisabled(widgetIndex); if (oldState != value) { - WidgetSetDisabled(*this, widgetIndex, value); + widgetSetDisabled(*this, widgetIndex, value); InvalidateWidget(widgetIndex); } } void Window::SetWidgetPressed(WidgetIndex widgetIndex, bool value) { - WidgetSetPressed(*this, widgetIndex, value); + widgetSetPressed(*this, widgetIndex, value); } void Window::SetCheckboxValue(WidgetIndex widgetIndex, bool value) @@ -501,7 +501,7 @@ namespace OpenRCT2 auto& widget = w->widgets[i]; assert(widget.type == WidgetType::tab); - if (!WidgetIsDisabled(*w, i)) + if (!widgetIsDisabled(*w, i)) { widget.left = x; widget.right = x + tab_width; @@ -708,7 +708,7 @@ namespace OpenRCT2::Ui::Windows if (scrollPositionChanged) { - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); w.Invalidate(); } scrollIndex++; @@ -742,7 +742,7 @@ namespace OpenRCT2::Ui::Windows if (widget.content & SCROLL_VERTICAL) scroll.flags |= VSCROLLBAR_VISIBLE; - WidgetScrollUpdateThumbs(w, widgetIndex); + widgetScrollUpdateThumbs(w, widgetIndex); scroll_index++; } } diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index 31f106c1db..385118271f 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -478,7 +478,7 @@ namespace OpenRCT2::Ui::Windows { if (widget.type == WidgetType::scroll) { - WidgetScrollUpdateThumbs(*this, widgetIndex); + widgetScrollUpdateThumbs(*this, widgetIndex); } widgetIndex++; } @@ -543,7 +543,7 @@ namespace OpenRCT2::Ui::Windows if (viewport != nullptr) { auto widgetIndex = GetViewportWidgetIndex(); - if (WidgetIsVisible(*this, widgetIndex.value_or(false))) + if (widgetIsVisible(*this, widgetIndex.value_or(false))) { WindowDrawViewport(rt, *this); } @@ -610,7 +610,7 @@ namespace OpenRCT2::Ui::Windows widget.flags.flip(WidgetFlag::isPressed); bool isChecked = widget.flags.has(WidgetFlag::isPressed); - WidgetSetCheckboxValue(*this, widgetIndex, isChecked); + widgetSetCheckboxValue(*this, widgetIndex, isChecked); std::vector args; auto ctx = widgetDesc->OnChange.context(); @@ -864,7 +864,7 @@ namespace OpenRCT2::Ui::Windows { auto widgetIndex = static_cast(WIDX_TAB_0 + tabIndex); auto widget = &widgets[widgetIndex]; - if (WidgetIsVisible(*this, widgetIndex)) + if (widgetIsVisible(*this, widgetIndex)) { auto leftTop = windowPos + tab.offset + ScreenCoordsXY{ widget->left, widget->top }; auto image = tab.imageFrameBase; @@ -1008,7 +1008,7 @@ namespace OpenRCT2::Ui::Windows else if (desc.Type == "colourpicker") { widget.type = WidgetType::colourBtn; - widget.image = GetColourButtonImage(desc.Colour); + widget.image = getColourButtonImage(desc.Colour); widgetList.push_back(widget); } else if (desc.Type == "custom") @@ -1244,7 +1244,7 @@ namespace OpenRCT2::Ui::Windows if (lastColour != colour && colour < COLOUR_COUNT) { customWidgetInfo->Colour = colour; - widget.image = GetColourButtonImage(colour); + widget.image = getColourButtonImage(colour); auto* windowMgr = Ui::GetWindowManager(); windowMgr->InvalidateWidget(*w, widgetIndex); diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp index 732f1cf022..522e3556cd 100644 --- a/src/openrct2-ui/scripting/ScWidget.hpp +++ b/src/openrct2-ui/scripting/ScWidget.hpp @@ -303,7 +303,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return Ui::WidgetIsDisabled(*w, _widgetIndex); + return Ui::widgetIsDisabled(*w, _widgetIndex); } return false; } @@ -312,19 +312,19 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - Ui::WidgetSetDisabled(*w, _widgetIndex, value); + Ui::widgetSetDisabled(*w, _widgetIndex, value); auto widget = GetWidget(); if (widget != nullptr) { if (widget->type == WidgetType::dropdownMenu) { - Ui::WidgetSetDisabled(*w, _widgetIndex + 1, value); + Ui::widgetSetDisabled(*w, _widgetIndex + 1, value); } else if (widget->type == WidgetType::spinner) { - Ui::WidgetSetDisabled(*w, _widgetIndex + 1, value); - Ui::WidgetSetDisabled(*w, _widgetIndex + 2, value); + Ui::widgetSetDisabled(*w, _widgetIndex + 1, value); + Ui::widgetSetDisabled(*w, _widgetIndex + 2, value); } } Invalidate(widget); @@ -336,7 +336,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return Ui::WidgetIsVisible(*w, _widgetIndex); + return Ui::widgetIsVisible(*w, _widgetIndex); } return false; } @@ -345,19 +345,19 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - Ui::WidgetSetVisible(*w, _widgetIndex, value); + Ui::widgetSetVisible(*w, _widgetIndex, value); auto widget = GetWidget(); if (widget != nullptr) { if (widget->type == WidgetType::dropdownMenu) { - Ui::WidgetSetVisible(*w, _widgetIndex + 1, value); + Ui::widgetSetVisible(*w, _widgetIndex + 1, value); } else if (widget->type == WidgetType::spinner) { - Ui::WidgetSetVisible(*w, _widgetIndex + 1, value); - Ui::WidgetSetVisible(*w, _widgetIndex + 2, value); + Ui::widgetSetVisible(*w, _widgetIndex + 1, value); + Ui::widgetSetVisible(*w, _widgetIndex + 2, value); } } Invalidate(widget); @@ -492,7 +492,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return Ui::WidgetIsPressed(*w, _widgetIndex); + return Ui::widgetIsPressed(*w, _widgetIndex); } return false; } @@ -501,7 +501,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - Ui::WidgetSetCheckboxValue(*w, _widgetIndex, value ? 1 : 0); + Ui::widgetSetCheckboxValue(*w, _widgetIndex, value ? 1 : 0); Invalidate(); } } @@ -554,7 +554,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - return Ui::WidgetIsPressed(*w, _widgetIndex); + return Ui::widgetIsPressed(*w, _widgetIndex); } return false; } @@ -563,7 +563,7 @@ namespace OpenRCT2::Scripting auto w = GetWindow(); if (w != nullptr) { - Ui::WidgetSetCheckboxValue(*w, _widgetIndex, value ? 1 : 0); + Ui::widgetSetCheckboxValue(*w, _widgetIndex, value ? 1 : 0); Invalidate(); } } diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index aebd176c38..2a294357ea 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -299,7 +299,7 @@ namespace OpenRCT2::Ui::Windows disabled_widgets |= (1uLL << WIDX_BANNER_TEXT) | (1uLL << WIDX_TEXT_COLOUR_DROPDOWN) | (1uLL << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON); } - colourBtn.image = GetColourButtonImage(banner->colour); + colourBtn.image = getColourButtonImage(banner->colour); Widget& dropDownWidget = widgets[WIDX_TEXT_COLOUR_DROPDOWN]; dropDownWidget.text = kBannerColouredTextFormats[EnumValue(banner->textColour)]; } diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 99d08fba08..82ed264df4 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -138,12 +138,12 @@ namespace OpenRCT2::Ui::Windows Invalidate(); } - WidgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_WIDE_PATHS, gPaintWidePathsAsGhost); - WidgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_BLOCKED_TILES, gPaintBlockedTiles); - WidgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_SEGMENT_HEIGHTS, gShowSupportSegmentHeights); - WidgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_BOUND_BOXES, gPaintBoundingBoxes); - WidgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_DIRTY_VISUALS, gShowDirtyVisuals); - WidgetSetCheckboxValue(*this, WIDX_TOGGLE_STABLE_PAINT_SORT, gPaintStableSort); + widgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_WIDE_PATHS, gPaintWidePathsAsGhost); + widgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_BLOCKED_TILES, gPaintBlockedTiles); + widgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_SEGMENT_HEIGHTS, gShowSupportSegmentHeights); + widgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_BOUND_BOXES, gPaintBoundingBoxes); + widgetSetCheckboxValue(*this, WIDX_TOGGLE_SHOW_DIRTY_VISUALS, gShowDirtyVisuals); + widgetSetCheckboxValue(*this, WIDX_TOGGLE_STABLE_PAINT_SORT, gPaintStableSort); } void OnDraw(RenderTarget& rt) override diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index c779d21c5a..97039cbfc6 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -491,7 +491,7 @@ namespace OpenRCT2::Ui::Windows int32_t outScrollArea{}; ScreenCoordsXY outScrollCoords{}; int32_t outScrollId{}; - WidgetScrollGetPart(*this, &widget, screenCoords, outScrollCoords, &outScrollArea, &outScrollId); + widgetScrollGetPart(*this, &widget, screenCoords, outScrollCoords, &outScrollArea, &outScrollId); if (outScrollArea == SCROLL_PART_VIEW) { const auto isInvented = outScrollId == 0; diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 4992684454..6e444e4226 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -846,7 +846,7 @@ namespace OpenRCT2::Ui::Windows const auto& widget = this->widgets[widgetIndex]; scrolls[scrollId].contentOffsetX = std::max(0, scrolls[scrollId].contentWidth - (widget.width() - 2)); - WidgetScrollUpdateThumbs(*this, widgetIndex); + widgetScrollUpdateThumbs(*this, widgetIndex); } void DrawTabImage(RenderTarget& rt, int32_t tabPage, int32_t spriteIndex) diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 1d40b545ed..68dd383cf1 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -445,7 +445,7 @@ namespace OpenRCT2::Ui::Windows // Ensure min size is large enough for all tabs to fit for (int32_t i = WIDX_TAB_1; i <= WIDX_TAB_7; i++) { - if (!WidgetIsDisabled(*this, i)) + if (!widgetIsDisabled(*this, i)) { minSize.width = std::max(minSize.width, widgets[i].right + 3); } @@ -481,13 +481,13 @@ namespace OpenRCT2::Ui::Windows if (peep->CanBePickedUp()) { - if (WidgetIsDisabled(*this, WIDX_PICKUP)) + if (widgetIsDisabled(*this, WIDX_PICKUP)) Invalidate(); } else { newDisabledWidgets = (1uLL << WIDX_PICKUP); - if (!WidgetIsDisabled(*this, WIDX_PICKUP)) + if (!widgetIsDisabled(*this, WIDX_PICKUP)) Invalidate(); } if (getGameState().park.Flags & PARK_FLAGS_NO_MONEY) @@ -542,7 +542,7 @@ namespace OpenRCT2::Ui::Windows void OverviewTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_1)) + if (widgetIsDisabled(*this, WIDX_TAB_1)) return; const auto& widget = widgets[WIDX_TAB_1]; @@ -1046,7 +1046,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Stats void StatsTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_2)) + if (widgetIsDisabled(*this, WIDX_TAB_2)) return; const auto& widget = widgets[WIDX_TAB_2]; @@ -1111,25 +1111,25 @@ namespace OpenRCT2::Ui::Windows } int32_t happinessPercentage = NormalizeGuestStatValue(peep->Happiness, kPeepMaxHappiness, 10); - WidgetProgressBarSetNewPercentage(widgets[WIDX_HAPPINESS_BAR], happinessPercentage); + widgetProgressBarSetNewPercentage(widgets[WIDX_HAPPINESS_BAR], happinessPercentage); int32_t energyPercentage = NormalizeGuestStatValue( peep->Energy - kPeepMinEnergy, kPeepMaxEnergy - kPeepMinEnergy, 10); - WidgetProgressBarSetNewPercentage(widgets[WIDX_ENERGY_BAR], energyPercentage); + widgetProgressBarSetNewPercentage(widgets[WIDX_ENERGY_BAR], energyPercentage); int32_t hungerPercentage = NormalizeGuestStatValue(peep->Hunger - 32, 158, 0); hungerPercentage = 100 - hungerPercentage; // the bar should be longer when peep->Hunger is low - WidgetProgressBarSetNewPercentage(widgets[WIDX_HUNGER_BAR], hungerPercentage); + widgetProgressBarSetNewPercentage(widgets[WIDX_HUNGER_BAR], hungerPercentage); int32_t thirstPercentage = NormalizeGuestStatValue(peep->Thirst - 32, 158, 0); thirstPercentage = 100 - thirstPercentage; // the bar should be longer when peep->Thirst is low - WidgetProgressBarSetNewPercentage(widgets[WIDX_THIRST_BAR], thirstPercentage); + widgetProgressBarSetNewPercentage(widgets[WIDX_THIRST_BAR], thirstPercentage); int32_t nauseaPercentage = NormalizeGuestStatValue(peep->Nausea - 32, 223, 0); - WidgetProgressBarSetNewPercentage(widgets[WIDX_NAUSEA_BAR], nauseaPercentage); + widgetProgressBarSetNewPercentage(widgets[WIDX_NAUSEA_BAR], nauseaPercentage); int32_t toiletPercentage = NormalizeGuestStatValue(peep->Toilet - 64, 178, 0); - WidgetProgressBarSetNewPercentage(widgets[WIDX_TOILET_BAR], toiletPercentage); + widgetProgressBarSetNewPercentage(widgets[WIDX_TOILET_BAR], toiletPercentage); DrawWidgets(rt); OverviewTabDraw(rt); @@ -1202,7 +1202,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Rides void RidesTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_3)) + if (widgetIsDisabled(*this, WIDX_TAB_3)) return; const auto& widget = widgets[WIDX_TAB_3]; @@ -1373,7 +1373,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Finance void FinanceTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_4)) + if (widgetIsDisabled(*this, WIDX_TAB_4)) return; const auto& widget = widgets[WIDX_TAB_4]; @@ -1511,7 +1511,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Thoughts void ThoughtsTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_5)) + if (widgetIsDisabled(*this, WIDX_TAB_5)) return; const auto& widget = widgets[WIDX_TAB_5]; @@ -1589,7 +1589,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Inventory void InventoryTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_6)) + if (widgetIsDisabled(*this, WIDX_TAB_6)) return; const auto& widget = widgets[WIDX_TAB_6]; @@ -1779,7 +1779,7 @@ namespace OpenRCT2::Ui::Windows #pragma region Debug void DebugTabDraw(RenderTarget& rt) { - if (WidgetIsDisabled(*this, WIDX_TAB_7)) + if (widgetIsDisabled(*this, WIDX_TAB_7)) return; const auto& widget = widgets[WIDX_TAB_7]; diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 2ee39d67e7..efd6fe9cf6 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -275,8 +275,8 @@ namespace OpenRCT2::Ui::Windows screenCoords = { windowPos.x + previewWidget->left, windowPos.y + previewWidget->top }; auto sprite = ImageId(gLandToolSize % 2 == 0 ? SPR_G2_MOUNTAIN_TOOL_EVEN : SPR_G2_MOUNTAIN_TOOL_ODD); GfxDrawSprite(rt, sprite, screenCoords); - WidgetDraw(rt, *this, WIDX_DECREMENT); - WidgetDraw(rt, *this, WIDX_INCREMENT); + widgetDraw(rt, *this, WIDX_DECREMENT); + widgetDraw(rt, *this, WIDX_INCREMENT); } screenCoords = { windowPos.x + previewWidget->midX(), windowPos.y + previewWidget->bottom + 5 }; diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index eae1ef6f04..779dc6b530 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -656,7 +656,7 @@ namespace OpenRCT2::Ui::Windows } if (_recalculateScrollbars) { - WidgetScrollUpdateThumbs(*this, WIDX_MAP); + widgetScrollUpdateThumbs(*this, WIDX_MAP); _recalculateScrollbars = false; } } @@ -757,7 +757,7 @@ namespace OpenRCT2::Ui::Windows scrolls[0].contentOffsetX = cx; scrolls[0].contentOffsetY = dx; - WidgetScrollUpdateThumbs(*this, WIDX_MAP); + widgetScrollUpdateThumbs(*this, WIDX_MAP); } void IncreaseMapSize() diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 1b57b889c4..2248bcdd94 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -304,7 +304,7 @@ namespace OpenRCT2::Ui::Windows { WidgetIndex widgetIndex = WIDX_TAB_1 + newPage; - if (!WidgetIsDisabled(*this, widgetIndex)) + if (!widgetIsDisabled(*this, widgetIndex)) { if (page == newPage) { diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index e39269614c..9f8204bf7c 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -357,9 +357,9 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_WEEKS_SPINNER].text = kStringIdNone; // Enable / disable start button based on ride dropdown - WidgetSetDisabled(*this, WIDX_START_BUTTON, false); + widgetSetDisabled(*this, WIDX_START_BUTTON, false); if (widgets[WIDX_RIDE_DROPDOWN].type == WidgetType::dropdownMenu && Campaign.RideId == RideId::GetNull()) - WidgetSetDisabled(*this, WIDX_START_BUTTON, true); + widgetSetDisabled(*this, WIDX_START_BUTTON, true); } void OnDraw(RenderTarget& rt) override diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 33ff37f04d..09e3ee172d 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -345,7 +345,7 @@ namespace OpenRCT2::Ui::Windows _windowNewRideTabScroll[_currentTab] = scrolls[0].contentOffsetY; // Remove highlight when mouse leaves rides list - if (!WidgetIsHighlighted(*this, WIDX_RIDE_LIST) && _newRideVars.HighlightedRide.Type != kRideTypeNull) + if (!widgetIsHighlighted(*this, WIDX_RIDE_LIST) && _newRideVars.HighlightedRide.Type != kRideTypeNull) { _newRideVars.HighlightedRide = { kRideTypeNull, kObjectEntryIndexNull }; InvalidateWidget(WIDX_RIDE_LIST); @@ -918,7 +918,7 @@ namespace OpenRCT2::Ui::Windows currentTabScroll = std::min(currentTabScroll, std::max(0, scrollSize.height - listWidgetHeight)); scrolls[0].contentOffsetY = currentTabScroll; - WidgetScrollUpdateThumbs(*this, WIDX_RIDE_LIST); + widgetScrollUpdateThumbs(*this, WIDX_RIDE_LIST); } void DrawRideInformation(RenderTarget& rt, RideSelection item, const ScreenCoordsXY& screenPos, int32_t textWidth) @@ -1008,7 +1008,7 @@ namespace OpenRCT2::Ui::Windows { WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast(tab); - if (widgets[widgetIndex].type != WidgetType::empty && !WidgetIsDisabled(*this, widgetIndex)) + if (widgets[widgetIndex].type != WidgetType::empty && !widgetIsDisabled(*this, widgetIndex)) { int32_t frame = 0; if (_currentTab == tab) diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 77c60a5acb..37e33f8c1d 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -126,7 +126,7 @@ namespace OpenRCT2::Ui::Windows auto& widget = widgets[WIDX_SCROLL]; ScreenSize scrollSize = OnScrollGetSize(0); scrolls[0].contentOffsetY = std::max(0, scrollSize.height - (widget.height() - 1)); - WidgetScrollUpdateThumbs(*this, WIDX_SCROLL); + widgetScrollUpdateThumbs(*this, WIDX_SCROLL); } void InitOptionsWidgets() diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index ba619b3d66..fef1cc10e7 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -441,7 +441,7 @@ namespace OpenRCT2::Ui::Windows frame_no++; // Check if the mouse is hovering over the list - if (!WidgetIsHighlighted(*this, WIDX_SCROLL)) + if (!widgetIsHighlighted(*this, WIDX_SCROLL)) { _highlightedIndex = -1; InvalidateWidget(WIDX_SCROLL); diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index f5678b489a..25a789101e 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1159,7 +1159,7 @@ namespace OpenRCT2::Ui::Windows Config::Get().general.EnableLightFxForVehicles = false; } - WidgetSetCheckboxValue( + widgetSetCheckboxValue( *this, WIDX_RENDER_WEATHER_EFFECTS_CHECKBOX, Config::Get().general.RenderWeatherEffects || Config::Get().general.RenderWeatherGloom); SetCheckboxValue(WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, Config::Get().general.DisableLightningEffect); @@ -1607,8 +1607,8 @@ namespace OpenRCT2::Ui::Windows SetCheckboxValue(WIDX_MASTER_SOUND_CHECKBOX, Config::Get().sound.MasterSoundEnabled); SetCheckboxValue(WIDX_MUSIC_CHECKBOX, Config::Get().sound.RideMusicEnabled); SetCheckboxValue(WIDX_AUDIO_FOCUS_CHECKBOX, Config::Get().sound.audio_focus); - WidgetSetEnabled(*this, WIDX_SOUND_CHECKBOX, Config::Get().sound.MasterSoundEnabled); - WidgetSetEnabled(*this, WIDX_MUSIC_CHECKBOX, Config::Get().sound.MasterSoundEnabled); + widgetSetEnabled(*this, WIDX_SOUND_CHECKBOX, Config::Get().sound.MasterSoundEnabled); + widgetSetEnabled(*this, WIDX_MUSIC_CHECKBOX, Config::Get().sound.MasterSoundEnabled); // Initialize only on first frame, otherwise the scrollbars won't be able to be modified if (frame_no == 0) @@ -1688,7 +1688,7 @@ namespace OpenRCT2::Ui::Windows SetCheckboxValue(WIDX_ENLARGED_UI, Config::Get().interface.EnlargedUi); SetCheckboxValue(WIDX_TOUCH_ENHANCEMENTS, Config::Get().interface.TouchEnhancements); - WidgetSetEnabled(*this, WIDX_TOUCH_ENHANCEMENTS, Config::Get().interface.EnlargedUi); + widgetSetEnabled(*this, WIDX_TOUCH_ENHANCEMENTS, Config::Get().interface.EnlargedUi); } #pragma endregion @@ -2322,7 +2322,7 @@ namespace OpenRCT2::Ui::Windows auto screenCoords = windowPos + ScreenCoordsXY{ widget->left, widget->top }; - if (!WidgetIsDisabled(*this, widgetIndex)) + if (!widgetIsDisabled(*this, widgetIndex)) { if (page == p) { @@ -2367,7 +2367,7 @@ namespace OpenRCT2::Ui::Windows int32_t widgetSize = scroll.contentWidth - (widget.width() - 1); scroll.contentOffsetX = ceil(volume / 100.0f * widgetSize); - WidgetScrollUpdateThumbs(*this, widgetIndex); + widgetScrollUpdateThumbs(*this, widgetIndex); } static bool IsRCT1TitleMusicAvailable() diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index c60e789a1a..93af8de9fb 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -540,9 +540,9 @@ namespace OpenRCT2::Ui::Windows const bool parkIsOpen = gameState.park.IsOpen(); widgets[WIDX_OPEN_OR_CLOSE].image = ImageId(parkIsOpen ? SPR_OPEN : SPR_CLOSED); const auto closeLightImage = SPR_G2_RCT1_CLOSE_BUTTON_0 + !parkIsOpen * 2 - + WidgetIsPressed(*this, WIDX_CLOSE_LIGHT); + + widgetIsPressed(*this, WIDX_CLOSE_LIGHT); widgets[WIDX_CLOSE_LIGHT].image = ImageId(closeLightImage); - const auto openLightImage = SPR_G2_RCT1_OPEN_BUTTON_0 + parkIsOpen * 2 + WidgetIsPressed(*this, WIDX_OPEN_LIGHT); + const auto openLightImage = SPR_G2_RCT1_OPEN_BUTTON_0 + parkIsOpen * 2 + widgetIsPressed(*this, WIDX_OPEN_LIGHT); widgets[WIDX_OPEN_LIGHT].image = ImageId(openLightImage); // Only allow closing of park for guest / rating objective @@ -1229,7 +1229,7 @@ namespace OpenRCT2::Ui::Windows void DrawTabImages(RenderTarget& rt) { // Entrance tab - if (!WidgetIsDisabled(*this, WIDX_TAB_1)) + if (!widgetIsDisabled(*this, WIDX_TAB_1)) { GfxDrawSprite( rt, ImageId(SPR_TAB_PARK_ENTRANCE), @@ -1237,7 +1237,7 @@ namespace OpenRCT2::Ui::Windows } // Rating tab - if (!WidgetIsDisabled(*this, WIDX_TAB_2)) + if (!widgetIsDisabled(*this, WIDX_TAB_2)) { ImageId spriteIdx(SPR_TAB_GRAPH_0); if (page == WINDOW_PARK_PAGE_RATING) @@ -1252,7 +1252,7 @@ namespace OpenRCT2::Ui::Windows } // Guests tab - if (!WidgetIsDisabled(*this, WIDX_TAB_3)) + if (!widgetIsDisabled(*this, WIDX_TAB_3)) { ImageId spriteIdx(SPR_TAB_GRAPH_0); if (page == WINDOW_PARK_PAGE_GUESTS) @@ -1270,7 +1270,7 @@ namespace OpenRCT2::Ui::Windows } // Price tab - if (!WidgetIsDisabled(*this, WIDX_TAB_4)) + if (!widgetIsDisabled(*this, WIDX_TAB_4)) { ImageId spriteIdx(SPR_TAB_ADMISSION_0); if (page == WINDOW_PARK_PAGE_PRICE) @@ -1279,7 +1279,7 @@ namespace OpenRCT2::Ui::Windows } // Statistics tab - if (!WidgetIsDisabled(*this, WIDX_TAB_5)) + if (!widgetIsDisabled(*this, WIDX_TAB_5)) { ImageId spriteIdx(SPR_TAB_STATS_0); if (page == WINDOW_PARK_PAGE_STATS) @@ -1288,7 +1288,7 @@ namespace OpenRCT2::Ui::Windows } // Objective tab - if (!WidgetIsDisabled(*this, WIDX_TAB_6)) + if (!widgetIsDisabled(*this, WIDX_TAB_6)) { ImageId spriteIdx(SPR_TAB_OBJECTIVE_0); if (page == WINDOW_PARK_PAGE_OBJECTIVE) @@ -1297,7 +1297,7 @@ namespace OpenRCT2::Ui::Windows } // Awards tab - if (!WidgetIsDisabled(*this, WIDX_TAB_7)) + if (!widgetIsDisabled(*this, WIDX_TAB_7)) { GfxDrawSprite( rt, ImageId(SPR_TAB_AWARDS), diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 6009d34c69..3d51ededb2 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -408,7 +408,7 @@ namespace OpenRCT2::Ui::Windows const bool canKick = NetworkCanPerformAction(NetworkGetCurrentPlayerGroupIndex(), NetworkPermission::KickPlayer); const bool isServer = NetworkGetPlayerFlags(playerIndex) & NETWORK_PLAYER_FLAG_ISSERVER; const bool isOwnWindow = (NetworkGetCurrentPlayerId() == number); - WidgetSetEnabled(*this, WIDX_KICK, canKick && !isOwnWindow && !isServer); + widgetSetEnabled(*this, WIDX_KICK, canKick && !isOwnWindow && !isServer); } void OnDrawOverview(RenderTarget& rt) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 5c83c505d6..1d17630306 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1205,7 +1205,7 @@ namespace OpenRCT2::Ui::Windows { WidgetIndex widgetIndex = WIDX_TAB_1 + tab; - if (!WidgetIsDisabled(*this, widgetIndex)) + if (!widgetIsDisabled(*this, widgetIndex)) { if (page == tab) { @@ -1221,7 +1221,7 @@ namespace OpenRCT2::Ui::Windows void DrawTabMain(RenderTarget& rt) { WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast(WINDOW_RIDE_PAGE_MAIN); - if (!WidgetIsDisabled(*this, widgetIndex)) + if (!widgetIsDisabled(*this, widgetIndex)) { auto ride = GetRide(rideId); if (ride != nullptr) @@ -1257,7 +1257,7 @@ namespace OpenRCT2::Ui::Windows WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast(WINDOW_RIDE_PAGE_VEHICLE); const auto& widget = widgets[widgetIndex]; - if (!WidgetIsDisabled(*this, widgetIndex)) + if (!widgetIsDisabled(*this, widgetIndex)) { const Ride* const ride = GetRide(rideId); if (ride == nullptr) @@ -1319,7 +1319,7 @@ namespace OpenRCT2::Ui::Windows { WidgetIndex widgetIndex = WIDX_TAB_1 + static_cast(WINDOW_RIDE_PAGE_CUSTOMER); - if (!WidgetIsDisabled(*this, widgetIndex)) + if (!widgetIsDisabled(*this, widgetIndex)) { const auto& widget = widgets[widgetIndex]; int32_t spriteIndex = 0; @@ -2343,25 +2343,25 @@ namespace OpenRCT2::Ui::Windows #ifdef __SIMULATE_IN_RIDE_WINDOW__ widgets[WIDX_CLOSE_LIGHT].image = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RideStatus::closed) * 2 - + WidgetIsPressed(*this, WIDX_CLOSE_LIGHT); + + widgetIsPressed(*this, WIDX_CLOSE_LIGHT); widgets[WIDX_SIMULATE_LIGHT].image = SPR_G2_RCT1_SIMULATE_BUTTON_0 + (ride->status == RideStatus::simulating) * 2 - + WidgetIsPressed(*w, WIDX_SIMULATE_LIGHT); + + widgetIsPressed(*w, WIDX_SIMULATE_LIGHT); widgets[WIDX_TEST_LIGHT].image = SPR_G2_RCT1_TEST_BUTTON_0 + (ride->status == RideStatus::testing) * 2 - + WidgetIsPressed(*this, WIDX_TEST_LIGHT); + + widgetIsPressed(*this, WIDX_TEST_LIGHT); #else const auto closeLightImage = SPR_G2_RCT1_CLOSE_BUTTON_0 + (ride->status == RideStatus::closed) * 2 - + WidgetIsPressed(*this, WIDX_CLOSE_LIGHT); + + widgetIsPressed(*this, WIDX_CLOSE_LIGHT); widgets[WIDX_CLOSE_LIGHT].image = ImageId(closeLightImage); auto baseSprite = ride->status == RideStatus::simulating ? SPR_G2_RCT1_SIMULATE_BUTTON_0 : SPR_G2_RCT1_TEST_BUTTON_0; const auto testLightImage = baseSprite + (ride->status == RideStatus::testing || ride->status == RideStatus::simulating) * 2 - + WidgetIsPressed(*this, WIDX_TEST_LIGHT); + + widgetIsPressed(*this, WIDX_TEST_LIGHT); widgets[WIDX_TEST_LIGHT].image = ImageId(testLightImage); #endif const auto openLightImage = SPR_G2_RCT1_OPEN_BUTTON_0 + (ride->status == RideStatus::open) * 2 - + WidgetIsPressed(*this, WIDX_OPEN_LIGHT); + + widgetIsPressed(*this, WIDX_OPEN_LIGHT); widgets[WIDX_OPEN_LIGHT].image = ImageId(openLightImage); const int32_t offset = gameState.cheats.allowArbitraryRideTypeChanges ? 15 : 0; @@ -4033,10 +4033,10 @@ namespace OpenRCT2::Ui::Windows return; uint16_t reliability = ride->reliabilityPercentage; - WidgetProgressBarSetNewPercentage(widgets[WIDX_RELIABILITY_BAR], std::max(10, reliability)); + widgetProgressBarSetNewPercentage(widgets[WIDX_RELIABILITY_BAR], std::max(10, reliability)); uint16_t downTime = ride->downtime; - WidgetProgressBarSetNewPercentage(widgets[WIDX_DOWN_TIME_BAR], downTime); + widgetProgressBarSetNewPercentage(widgets[WIDX_DOWN_TIME_BAR], downTime); DrawWidgets(rt); DrawTabImages(rt); @@ -4624,7 +4624,7 @@ namespace OpenRCT2::Ui::Windows if (HasTrackColour(*ride, 0)) { widgets[WIDX_TRACK_MAIN_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_TRACK_MAIN_COLOUR].image = GetColourButtonImage(trackColour.main); + widgets[WIDX_TRACK_MAIN_COLOUR].image = getColourButtonImage(trackColour.main); } else { @@ -4635,7 +4635,7 @@ namespace OpenRCT2::Ui::Windows if (HasTrackColour(*ride, 1)) { widgets[WIDX_TRACK_ADDITIONAL_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_TRACK_ADDITIONAL_COLOUR].image = GetColourButtonImage(trackColour.additional); + widgets[WIDX_TRACK_ADDITIONAL_COLOUR].image = getColourButtonImage(trackColour.additional); } else { @@ -4664,7 +4664,7 @@ namespace OpenRCT2::Ui::Windows if (HasTrackColour(*ride, 2) && rtd.specialType != RtdSpecialType::maze) { widgets[WIDX_TRACK_SUPPORT_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_TRACK_SUPPORT_COLOUR].image = GetColourButtonImage(trackColour.supports); + widgets[WIDX_TRACK_SUPPORT_COLOUR].image = getColourButtonImage(trackColour.supports); } else { @@ -4718,7 +4718,7 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_VEHICLE_PREVIEW].type = WidgetType::scroll; widgets[WIDX_VEHICLE_BODY_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_VEHICLE_BODY_COLOUR].image = GetColourButtonImage(vehicleColour.Body); + widgets[WIDX_VEHICLE_BODY_COLOUR].image = getColourButtonImage(vehicleColour.Body); bool allowChangingBodyColour = false; bool allowChangingTrimColour = false; @@ -4745,17 +4745,17 @@ namespace OpenRCT2::Ui::Windows if (allowChangingBodyColour) { widgets[WIDX_VEHICLE_BODY_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_VEHICLE_BODY_COLOUR].image = GetColourButtonImage(vehicleColour.Body); + widgets[WIDX_VEHICLE_BODY_COLOUR].image = getColourButtonImage(vehicleColour.Body); } if (allowChangingTrimColour) { widgets[WIDX_VEHICLE_TRIM_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_VEHICLE_TRIM_COLOUR].image = GetColourButtonImage(vehicleColour.Trim); + widgets[WIDX_VEHICLE_TRIM_COLOUR].image = getColourButtonImage(vehicleColour.Trim); } if (allowChangingTertiaryColour) { widgets[WIDX_VEHICLE_TERTIARY_COLOUR].type = WidgetType::colourBtn; - widgets[WIDX_VEHICLE_TERTIARY_COLOUR].image = GetColourButtonImage(vehicleColour.Tertiary); + widgets[WIDX_VEHICLE_TERTIARY_COLOUR].image = getColourButtonImage(vehicleColour.Tertiary); } // Vehicle colour scheme type @@ -5138,7 +5138,7 @@ namespace OpenRCT2::Ui::Windows Invalidate(); } - WidgetScrollUpdateThumbs(*this, WIDX_MUSIC_DATA); + widgetScrollUpdateThumbs(*this, WIDX_MUSIC_DATA); } ScreenSize MusicScrollGetSize(int32_t scrollIndex) @@ -5207,8 +5207,8 @@ namespace OpenRCT2::Ui::Windows auto isMusicActivated = (ride->lifecycleFlags & RIDE_LIFECYCLE_MUSIC) != 0; bool hasPreviewImage = musicObj != nullptr && musicObj->HasPreview(); - WidgetSetVisible(*this, WIDX_MUSIC_DATA, isMusicActivated); - WidgetSetVisible(*this, WIDX_MUSIC_IMAGE, isMusicActivated && hasPreviewImage); + widgetSetVisible(*this, WIDX_MUSIC_DATA, isMusicActivated); + widgetSetVisible(*this, WIDX_MUSIC_IMAGE, isMusicActivated && hasPreviewImage); if (isMusicActivated) { @@ -5954,7 +5954,7 @@ namespace OpenRCT2::Ui::Windows } scrolls[0].contentOffsetX = std::clamp(x, 0, scrolls[0].contentWidth - (widget->width() - 2)); - WidgetScrollUpdateThumbs(*this, WIDX_GRAPH); + widgetScrollUpdateThumbs(*this, WIDX_GRAPH); } ScreenSize GraphsScrollGetSize(int32_t scrollIndex) diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 75bdafd56c..9f5375828b 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -3766,7 +3766,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -3777,19 +3777,19 @@ namespace OpenRCT2::Ui::Windows switch (_currentlySelectedTrack.curve) { case TrackCurve::LeftSmall: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); } break; case TrackCurve::Left: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -3800,17 +3800,17 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftLarge: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -3821,21 +3821,21 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::None: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -3846,26 +3846,26 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightLarge: - if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -3876,31 +3876,31 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::Right: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -3911,36 +3911,36 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightSmall: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -3951,41 +3951,41 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightVerySmall: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } - else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_VERY_SMALL) && w->widgets[WIDX_LEFT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_VERY_SMALL); @@ -4004,7 +4004,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -4015,20 +4015,20 @@ namespace OpenRCT2::Ui::Windows switch (_currentlySelectedTrack.curve) { case TrackCurve::RightSmall: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); } break; case TrackCurve::Right: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4039,18 +4039,18 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::RightLarge: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4061,23 +4061,23 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::None: - if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4088,28 +4088,28 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftLarge: - if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4120,32 +4120,32 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::Left: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4156,37 +4156,37 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftSmall: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4197,41 +4197,41 @@ namespace OpenRCT2::Ui::Windows } break; case TrackCurve::LeftVerySmall: - if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE_SMALL) && w->widgets[WIDX_LEFT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_SMALL); } - else if (!WidgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEFT_CURVE) && w->widgets[WIDX_LEFT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_LEFT_CURVE_LARGE) && w->widgets[WIDX_LEFT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEFT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_LARGE) && w->widgets[WIDX_RIGHT_CURVE_LARGE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_LARGE); } - else if (!WidgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_RIGHT_CURVE) && w->widgets[WIDX_RIGHT_CURVE].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_SMALL) && w->widgets[WIDX_RIGHT_CURVE_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_SMALL); } else if ( - !WidgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) + !widgetIsDisabled(*w, WIDX_RIGHT_CURVE_VERY_SMALL) && w->widgets[WIDX_RIGHT_CURVE_VERY_SMALL].type != WidgetType::empty) { w->OnMouseDown(WIDX_RIGHT_CURVE_VERY_SMALL); @@ -4250,28 +4250,28 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } - if (!WidgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_STRAIGHT) && w->widgets[WIDX_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_STRAIGHT); } - if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - if (!WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) && w->widgets[WIDX_CHAIN_LIFT].type != WidgetType::empty + if (!widgetIsDisabled(*w, WIDX_CHAIN_LIFT) && w->widgets[WIDX_CHAIN_LIFT].type != WidgetType::empty && _currentTrackHasLiftHill) { w->OnMouseDown(WIDX_CHAIN_LIFT); } - if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_STRAIGHT); } @@ -4281,7 +4281,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -4289,20 +4289,20 @@ namespace OpenRCT2::Ui::Windows switch (_currentTrackPitchEnd) { case TrackPitch::Down60: - if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_VERTICAL) + if (IsTrackEnabled(TrackGroup::slopeVertical) && !widgetIsDisabled(*w, WIDX_SLOPE_DOWN_VERTICAL) && w->widgets[WIDX_SLOPE_DOWN_VERTICAL].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_VERTICAL); } break; case TrackPitch::Down25: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } break; case TrackPitch::None: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } @@ -4311,7 +4311,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4321,16 +4321,16 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Up25: - if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4340,15 +4340,15 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Up60: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } - else if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } @@ -4357,7 +4357,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); } @@ -4367,7 +4367,7 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Up90: - if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) + if (IsTrackEnabled(TrackGroup::slopeVertical) && !widgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_VERTICAL].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); @@ -4382,7 +4382,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_STRAIGHT) || w->widgets[WIDX_STRAIGHT].type == WidgetType::empty) { return; } @@ -4390,20 +4390,20 @@ namespace OpenRCT2::Ui::Windows switch (_currentTrackPitchEnd) { case TrackPitch::Up60: - if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_UP_VERTICAL) + if (IsTrackEnabled(TrackGroup::slopeVertical) && !widgetIsDisabled(*w, WIDX_SLOPE_UP_VERTICAL) && w->widgets[WIDX_SLOPE_UP_VERTICAL].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_VERTICAL); } break; case TrackPitch::Up25: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } break; case TrackPitch::None: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } @@ -4412,7 +4412,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4422,16 +4422,16 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Down25: - if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4441,15 +4441,15 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Down60: - if (!WidgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_SLOPE_DOWN) && w->widgets[WIDX_SLOPE_DOWN].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN); } - else if (!WidgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_LEVEL) && w->widgets[WIDX_LEVEL].type != WidgetType::empty) { w->OnMouseDown(WIDX_LEVEL); } - else if (!WidgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_SLOPE_UP) && w->widgets[WIDX_SLOPE_UP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP); } @@ -4458,7 +4458,7 @@ namespace OpenRCT2::Ui::Windows return; } else if ( - !WidgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) + !widgetIsDisabled(*w, WIDX_SLOPE_UP_STEEP) && w->widgets[WIDX_SLOPE_UP_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_UP_STEEP); } @@ -4468,7 +4468,7 @@ namespace OpenRCT2::Ui::Windows } break; case TrackPitch::Down90: - if (IsTrackEnabled(TrackGroup::slopeVertical) && !WidgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) + if (IsTrackEnabled(TrackGroup::slopeVertical) && !widgetIsDisabled(*w, WIDX_SLOPE_DOWN_STEEP) && w->widgets[WIDX_SLOPE_DOWN_STEEP].type != WidgetType::empty) { w->OnMouseDown(WIDX_SLOPE_DOWN_STEEP); @@ -4483,7 +4483,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_CHAIN_LIFT) || w->widgets[WIDX_CHAIN_LIFT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_CHAIN_LIFT) || w->widgets[WIDX_CHAIN_LIFT].type == WidgetType::empty) { return; } @@ -4495,7 +4495,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) + if (w == nullptr || widgetIsDisabled(*w, WIDX_BANK_STRAIGHT) || w->widgets[WIDX_BANK_STRAIGHT].type == WidgetType::empty) { return; @@ -4504,17 +4504,17 @@ namespace OpenRCT2::Ui::Windows switch (_currentTrackRollEnd) { case TrackRoll::None: - if (!WidgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_LEFT); } break; case TrackRoll::Right: - if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_STRAIGHT); } - else if (!WidgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_BANK_LEFT) && w->widgets[WIDX_BANK_LEFT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_LEFT); } @@ -4532,7 +4532,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) + if (w == nullptr || widgetIsDisabled(*w, WIDX_BANK_STRAIGHT) || w->widgets[WIDX_BANK_STRAIGHT].type == WidgetType::empty) { return; @@ -4541,17 +4541,17 @@ namespace OpenRCT2::Ui::Windows switch (_currentTrackRollEnd) { case TrackRoll::None: - if (!WidgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_RIGHT); } break; case TrackRoll::Left: - if (!WidgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) + if (!widgetIsDisabled(*w, WIDX_BANK_STRAIGHT) && w->widgets[WIDX_BANK_STRAIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_STRAIGHT); } - else if (!WidgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WidgetType::empty) + else if (!widgetIsDisabled(*w, WIDX_BANK_RIGHT) && w->widgets[WIDX_BANK_RIGHT].type != WidgetType::empty) { w->OnMouseDown(WIDX_BANK_RIGHT); } @@ -4569,7 +4569,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_PREVIOUS_SECTION) + if (w == nullptr || widgetIsDisabled(*w, WIDX_PREVIOUS_SECTION) || w->widgets[WIDX_PREVIOUS_SECTION].type == WidgetType::empty) { return; @@ -4582,7 +4582,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_NEXT_SECTION) || w->widgets[WIDX_NEXT_SECTION].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_NEXT_SECTION) || w->widgets[WIDX_NEXT_SECTION].type == WidgetType::empty) { return; } @@ -4594,7 +4594,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_CONSTRUCT) || w->widgets[WIDX_CONSTRUCT].type == WidgetType::empty) { return; } @@ -4606,7 +4606,7 @@ namespace OpenRCT2::Ui::Windows { auto* windowMgr = GetWindowManager(); WindowBase* w = windowMgr->FindByClass(WindowClass::RideConstruction); - if (w == nullptr || WidgetIsDisabled(*w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WidgetType::empty) + if (w == nullptr || widgetIsDisabled(*w, WIDX_DEMOLISH) || w->widgets[WIDX_DEMOLISH].type == WidgetType::empty) { return; } diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index f552bae988..94868ea86b 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -500,10 +500,10 @@ namespace OpenRCT2::Ui::Windows } const auto closeLightImage( - SPR_G2_RCT1_CLOSE_BUTTON_0 + (allClosed ? 1 : 0) * 2 + WidgetIsPressed(*this, WIDX_CLOSE_LIGHT)); + SPR_G2_RCT1_CLOSE_BUTTON_0 + (allClosed ? 1 : 0) * 2 + widgetIsPressed(*this, WIDX_CLOSE_LIGHT)); widgets[WIDX_CLOSE_LIGHT].image = ImageId(closeLightImage); const auto openLightImage = SPR_G2_RCT1_OPEN_BUTTON_0 + (allOpen ? 1 : 0) * 2 - + WidgetIsPressed(*this, WIDX_OPEN_LIGHT); + + widgetIsPressed(*this, WIDX_OPEN_LIGHT); widgets[WIDX_OPEN_LIGHT].image = ImageId(openLightImage); widgets[WIDX_QUICK_DEMOLISH].top = widgets[WIDX_OPEN_LIGHT].bottom + 3; } diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 6b7545310e..f4ceff2f5d 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -437,7 +437,7 @@ namespace OpenRCT2::Ui::Windows ScreenCoordsXY scrollPos = {}; int32_t scrollArea = 0; int32_t scrollId = 0; - WidgetScrollGetPart(*this, &widgets[WIDX_SCENERY_LIST], state->position, scrollPos, &scrollArea, &scrollId); + widgetScrollGetPart(*this, &widgets[WIDX_SCENERY_LIST], state->position, scrollPos, &scrollArea, &scrollId); if (scrollArea == SCROLL_PART_VIEW) { const ScenerySelection scenery = GetSceneryIdByCursorPos(scrollPos); @@ -722,9 +722,9 @@ namespace OpenRCT2::Ui::Windows } } - widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].image = GetColourButtonImage(_sceneryPrimaryColour); - widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].image = GetColourButtonImage(_scenerySecondaryColour); - widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].image = GetColourButtonImage(_sceneryTertiaryColour); + widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].image = getColourButtonImage(_sceneryPrimaryColour); + widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].image = getColourButtonImage(_scenerySecondaryColour); + widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].image = getColourButtonImage(_sceneryTertiaryColour); widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WidgetType::empty; widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WidgetType::empty; @@ -1192,7 +1192,7 @@ namespace OpenRCT2::Ui::Windows scrolls[SceneryContentScrollIndex].contentOffsetY = std::min( maxTop, scrolls[SceneryContentScrollIndex].contentOffsetY); - WidgetScrollUpdateThumbs(*this, WIDX_SCENERY_LIST); + widgetScrollUpdateThumbs(*this, WIDX_SCENERY_LIST); } SceneryItem ContentCountRowsWithSelectedItem(const size_t tabIndex) diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 0f08fb714f..e826540604 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -145,7 +145,7 @@ namespace OpenRCT2::Ui::Windows { ColourSchemeUpdateByClass(this, WindowClass::ServerList); - WidgetSetCheckboxValue(*this, WIDX_ADVERTISE_CHECKBOX, Config::Get().network.Advertise); + widgetSetCheckboxValue(*this, WIDX_ADVERTISE_CHECKBOX, Config::Get().network.Advertise); auto ft = Formatter::Common(); ft.Increment(18); ft.Add(Config::Get().network.Maxplayers); diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index 016e5d3e83..86312a853e 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -205,7 +205,7 @@ namespace OpenRCT2::Ui::Windows void OnUpdate() override { // Remove highlight when the mouse is not hovering over the list - if (_highlightedItem != -1 && !WidgetIsHighlighted(*this, WIDX_SCROLL)) + if (_highlightedItem != -1 && !widgetIsHighlighted(*this, WIDX_SCROLL)) { _highlightedItem = -1; InvalidateWidget(WIDX_SCROLL); diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 0ff17cbc0b..b6b9737538 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -287,8 +287,8 @@ namespace OpenRCT2::Ui::Windows } } - main_colour_btn->image = GetColourButtonImage(_mainColour); - text_colour_btn->image = GetColourButtonImage(_textColour); + main_colour_btn->image = getColourButtonImage(_mainColour); + text_colour_btn->image = getColourButtonImage(_textColour); } void OnDraw(RenderTarget& rt) override diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 2bd887572b..6578023381 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -253,7 +253,7 @@ namespace OpenRCT2::Ui::Windows if (GetSelectedStaffType() != StaffType::Entertainer) { widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WidgetType::colourBtn; - widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = GetColourButtonImage( + widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = getColourButtonImage( StaffGetColour(GetSelectedStaffType())); } SetWidgetPressed(WIDX_STAFF_LIST_QUICK_FIRE, _quickFireMode); diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 57156e24f3..6d71ea4be7 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -354,11 +354,11 @@ namespace OpenRCT2::Ui::Windows widgets[WIDX_THEMES_PRESETS_DROPDOWN].type = WidgetType::empty; widgets[WIDX_THEMES_COLOURBTN_MASK].type = WidgetType::empty; - WidgetSetCheckboxValue(*this, WIDX_THEMES_RCT1_RIDE_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE); - WidgetSetCheckboxValue(*this, WIDX_THEMES_RCT1_PARK_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_PARK); - WidgetSetCheckboxValue( + widgetSetCheckboxValue(*this, WIDX_THEMES_RCT1_RIDE_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_RIDE); + widgetSetCheckboxValue(*this, WIDX_THEMES_RCT1_PARK_LIGHTS, ThemeGetFlags() & UITHEME_FLAG_USE_LIGHTS_PARK); + widgetSetCheckboxValue( *this, WIDX_THEMES_RCT1_SCENARIO_FONT, ThemeGetFlags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT); - WidgetSetCheckboxValue( + widgetSetCheckboxValue( *this, 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 b9bdacba5c..091fc459c5 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -527,7 +527,7 @@ static uint64_t PageDisabledWidgets[] = { void OnUpdate() override { // Check if the mouse is hovering over the list - if (!WidgetIsHighlighted(*this, WIDX_LIST)) + if (!widgetIsHighlighted(*this, WIDX_LIST)) { if (_highlightedIndex != -1) InvalidateWidget(WIDX_LIST); diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 63c6d375b9..c5523fe7b8 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -887,7 +887,7 @@ namespace OpenRCT2::Ui::Windows { screenPos = { windowPos.x + widgets[WIDX_STAFF].left, windowPos.y + widgets[WIDX_STAFF].top }; imgId = SPR_TOOLBAR_STAFF; - if (WidgetIsPressed(*this, WIDX_STAFF)) + if (widgetIsPressed(*this, WIDX_STAFF)) imgId++; GfxDrawSprite(rt, ImageId(imgId, gameState.staffHandymanColour, gameState.staffMechanicColour), screenPos); } @@ -897,7 +897,7 @@ namespace OpenRCT2::Ui::Windows { screenPos = { windowPos.x + widgets[WIDX_FASTFORWARD].left + 0, windowPos.y + widgets[WIDX_FASTFORWARD].top + 0 }; - if (WidgetIsPressed(*this, WIDX_FASTFORWARD)) + if (widgetIsPressed(*this, WIDX_FASTFORWARD)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_G2_FASTFORWARD), screenPos + ScreenCoordsXY{ 6, 3 }); @@ -915,7 +915,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_CHEATS].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_CHEATS].left - 1, widgets[WIDX_CHEATS].top - 1 }; - if (WidgetIsPressed(*this, WIDX_CHEATS)) + if (widgetIsPressed(*this, WIDX_CHEATS)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_G2_SANDBOX), screenPos); @@ -933,7 +933,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_CHAT].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_CHAT].left, widgets[WIDX_CHAT].top - 2 }; - if (WidgetIsPressed(*this, WIDX_CHAT)) + if (widgetIsPressed(*this, WIDX_CHAT)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_G2_CHAT), screenPos); } @@ -942,7 +942,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_DEBUG].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_DEBUG].left, widgets[WIDX_DEBUG].top - 1 }; - if (WidgetIsPressed(*this, WIDX_DEBUG)) + if (widgetIsPressed(*this, WIDX_DEBUG)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_TAB_GEARS_0), screenPos); } @@ -951,7 +951,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_RESEARCH].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_RESEARCH].left - 1, widgets[WIDX_RESEARCH].top }; - if (WidgetIsPressed(*this, WIDX_RESEARCH)) + if (widgetIsPressed(*this, WIDX_RESEARCH)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_TAB_FINANCES_RESEARCH_0), screenPos); } @@ -960,7 +960,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_FINANCES].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_FINANCES].left + 3, widgets[WIDX_FINANCES].top + 1 }; - if (WidgetIsPressed(*this, WIDX_FINANCES)) + if (widgetIsPressed(*this, WIDX_FINANCES)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_FINANCE), screenPos); } @@ -969,7 +969,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_NEWS].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_NEWS].left + 3, widgets[WIDX_NEWS].top + 0 }; - if (WidgetIsPressed(*this, WIDX_NEWS)) + if (widgetIsPressed(*this, WIDX_NEWS)) screenPos.y++; GfxDrawSprite(rt, ImageId(SPR_G2_TAB_NEWS), screenPos); } @@ -978,7 +978,7 @@ namespace OpenRCT2::Ui::Windows if (widgets[WIDX_NETWORK].type != WidgetType::empty) { screenPos = windowPos + ScreenCoordsXY{ widgets[WIDX_NETWORK].left + 3, widgets[WIDX_NETWORK].top + 0 }; - if (WidgetIsPressed(*this, WIDX_NETWORK)) + if (widgetIsPressed(*this, 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 428b262477..8af625fc36 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -269,13 +269,13 @@ namespace OpenRCT2::Ui::Windows void OnPrepareDraw() override { - WidgetScrollUpdateThumbs(*this, WIDX_CLIP_HEIGHT_SLIDER); + widgetScrollUpdateThumbs(*this, WIDX_CLIP_HEIGHT_SLIDER); WindowBase* mainWindow = WindowGetMain(); if (mainWindow != nullptr) { - WidgetSetCheckboxValue(*this, WIDX_CLIP_CHECKBOX_ENABLE, mainWindow->viewport->flags & VIEWPORT_FLAG_CLIP_VIEW); - WidgetSetCheckboxValue( + widgetSetCheckboxValue(*this, WIDX_CLIP_CHECKBOX_ENABLE, mainWindow->viewport->flags & VIEWPORT_FLAG_CLIP_VIEW); + widgetSetCheckboxValue( *this, WIDX_CLIP_SEE_THROUGH_CHECKBOX_ENABLE, mainWindow->viewport->flags & VIEWPORT_FLAG_CLIP_VIEW_SEE_THROUGH); }