diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 98a5b32c96..1bee81d66b 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -1061,7 +1061,7 @@ static void InputWidgetLeft(const ScreenCoordsXY& screenCoords, rct_window* w, r InputScrollBegin(w, widgetIndex, screenCoords); break; default: - if (WidgetIsEnabled(w, widgetIndex) && !WidgetIsDisabled(w, widgetIndex)) + if (!WidgetIsDisabled(w, widgetIndex)) { OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + widget.midX()); diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index a276446df9..ec7dcdf5ce 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -839,13 +839,6 @@ static void WidgetDrawImage(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind } } -bool WidgetIsEnabled(rct_window* w, rct_widgetindex widgetIndex) -{ - if (!WidgetIsVisible(w, widgetIndex)) - return false; - return (w->enabled_widgets & (1LL << widgetIndex)) != 0; -} - bool WidgetIsDisabled(rct_window* w, rct_widgetindex widgetIndex) { return (w->disabled_widgets & (1LL << widgetIndex)) != 0; @@ -1024,16 +1017,7 @@ void WidgetScrollGetPart( void WidgetSetEnabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled) { - if (enabled) - { - w->enabled_widgets |= (1ULL << widgetIndex); - w->disabled_widgets &= ~(1ULL << widgetIndex); - } - else - { - w->enabled_widgets &= ~(1ULL << widgetIndex); - w->disabled_widgets |= (1ULL << widgetIndex); - } + WidgetSetDisabled(w, widgetIndex, !enabled); } void WidgetSetDisabled(rct_window* w, rct_widgetindex widgetIndex, bool value) diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index e0d1cd3d87..9ab102b3e4 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -392,7 +392,6 @@ namespace OpenRCT2::Ui::Windows { number = GetNewWindowNumber(); custom_info = new CustomWindowInfo(owner, desc); - enabled_widgets = (1ULL << WIDX_CLOSE); // Set window tab page = desc.TabIndex.value_or(0); @@ -858,7 +857,7 @@ namespace OpenRCT2::Ui::Windows { auto widgetIndex = static_cast(WIDX_TAB_0 + tabIndex); auto widget = &widgets[widgetIndex]; - if (WidgetIsEnabled(this, widgetIndex)) + if (WidgetIsVisible(this, widgetIndex)) { auto leftTop = windowPos + tab.offset + ScreenCoordsXY{ widget->left, widget->top }; auto image = tab.imageFrameBase; @@ -876,7 +875,6 @@ namespace OpenRCT2::Ui::Windows void RefreshWidgets() { - enabled_widgets = 0; pressed_widgets = 0; disabled_widgets = 0; @@ -893,7 +891,6 @@ namespace OpenRCT2::Ui::Windows { info.WidgetIndexMap.push_back(std::numeric_limits::max()); } - enabled_widgets = 1ULL << WIDX_CLOSE; // Add window tabs if (info.Desc.Tabs.size() != 0) @@ -913,7 +910,6 @@ namespace OpenRCT2::Ui::Windows widget.tooltip = STR_NONE; widgetList.push_back(widget); info.WidgetIndexMap.push_back(std::numeric_limits::max()); - enabled_widgets |= 1ULL << (widgetList.size() - 1); } // Add custom widgets @@ -957,10 +953,6 @@ namespace OpenRCT2::Ui::Windows { auto mask = 1ULL << i; auto widgetFlags = widgetList[i].flags; - if (widgetFlags & WIDGET_FLAGS::IS_ENABLED) - { - enabled_widgets |= mask; - } if (widgetFlags & WIDGET_FLAGS::IS_PRESSED) { pressed_widgets |= mask; @@ -997,7 +989,6 @@ namespace OpenRCT2::Ui::Windows widget.sztooltip = const_cast(desc.Tooltip.c_str()); widget.flags |= WIDGET_FLAGS::TOOLTIP_IS_STRING; } - widget.flags |= WIDGET_FLAGS::IS_ENABLED; if (desc.IsDisabled) widget.flags |= WIDGET_FLAGS::IS_DISABLED; if (!desc.IsVisible) @@ -1068,7 +1059,6 @@ namespace OpenRCT2::Ui::Windows widget.bottom = desc.Y + desc.Height - 2; widget.text = STR_DROPDOWN_GLYPH; widget.tooltip = STR_NONE; - widget.flags |= WIDGET_FLAGS::IS_ENABLED; if (desc.IsDisabled) widget.flags |= WIDGET_FLAGS::IS_DISABLED; widgetList.push_back(widget); @@ -1120,7 +1110,6 @@ namespace OpenRCT2::Ui::Windows widget.bottom = desc.Y + desc.Height - 2; widget.text = STR_NUMERIC_DOWN; widget.tooltip = STR_NONE; - widget.flags |= WIDGET_FLAGS::IS_ENABLED; if (desc.IsDisabled) widget.flags |= WIDGET_FLAGS::IS_DISABLED; widget.flags |= WIDGET_FLAGS::IS_HOLDABLE; diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index d24b1fa982..0aab0f7803 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -93,8 +93,6 @@ public: void OnOpen() override { widgets = _windowAboutOpenRCT2Widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_ABOUT_OPENRCT2) | (1ULL << WIDX_TAB_ABOUT_RCT2) - | (1ULL << WIDX_COPY_BUILD_INFO) | (1ULL << WIDX_CHANGELOG) | (1ULL << WIDX_JOIN_DISCORD); WindowInitScrollWidgets(this); SetPage(WINDOW_ABOUT_PAGE_OPENRCT2); @@ -171,8 +169,6 @@ private: frame_no = 0; pressed_widgets = 0; widgets = _windowAboutPageWidgets[p]; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_ABOUT_OPENRCT2) | (1ULL << WIDX_TAB_ABOUT_RCT2) - | (1ULL << WIDX_COPY_BUILD_INFO) | (1ULL << WIDX_CHANGELOG) | (1ULL << WIDX_JOIN_DISCORD); pressed_widgets |= (p == WINDOW_ABOUT_PAGE_RCT2) ? (1ULL << WIDX_TAB_ABOUT_RCT2) : (1ULL << WIDX_TAB_ABOUT_OPENRCT2); WindowInitScrollWidgets(this); @@ -205,7 +201,6 @@ private: // Shows the update available button if (OpenRCT2::GetContext()->HasNewVersionInfo()) { - enabled_widgets |= (1ULL << WIDX_NEW_VERSION); widgets[WIDX_NEW_VERSION].type = WindowWidgetType::Button; _windowAboutOpenRCT2Widgets[WIDX_NEW_VERSION].type = WindowWidgetType::Button; } diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 882e5a6dd6..7654df9010 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -126,9 +126,6 @@ public: void OnOpen() override { widgets = window_banner_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BANNER_TEXT) | (1ULL << WIDX_BANNER_NO_ENTRY) - | (1ULL << WIDX_BANNER_DEMOLISH) | (1ULL << WIDX_MAIN_COLOUR) | (1ULL << WIDX_TEXT_COLOUR_DROPDOWN) - | (1ULL << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON); WindowInitScrollWidgets(this); } diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index e5980376f8..4184f895b3 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -85,8 +85,6 @@ public: */ bool SetPersonality(int personality) { - enabled_widgets = (1ULL << WIDX_CLOSE); - switch (personality) { case WV_NEW_VERSION_INFO: @@ -96,7 +94,6 @@ public: } _personality = WV_NEW_VERSION_INFO; NewVersionProcessInfo(); - enabled_widgets |= (1ULL << WIDX_OPEN_URL); widgets[WIDX_OPEN_URL].type = WindowWidgetType::Button; return true; diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index ab6f905e21..11a45be7b9 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -319,104 +319,6 @@ static rct_widget *window_cheats_page_widgets[] = window_cheats_rides_widgets, }; -#define MAIN_CHEAT_ENABLED_WIDGETS (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) - -static uint64_t window_cheats_page_enabled_widgets[] = { - MAIN_CHEAT_ENABLED_WIDGETS | - (1ULL << WIDX_NO_MONEY) | - (1ULL << WIDX_ADD_SET_MONEY_GROUP) | - (1ULL << WIDX_MONEY_SPINNER) | - (1ULL << WIDX_MONEY_SPINNER_INCREMENT) | - (1ULL << WIDX_MONEY_SPINNER_DECREMENT) | - (1ULL << WIDX_ADD_MONEY) | - (1ULL << WIDX_SET_MONEY) | - (1ULL << WIDX_CLEAR_LOAN) | - (1ULL << WIDX_DATE_SET) | - (1ULL << WIDX_MONTH_BOX) | - (1ULL << WIDX_MONTH_UP) | - (1ULL << WIDX_MONTH_DOWN) | - (1ULL << WIDX_YEAR_BOX) | - (1ULL << WIDX_YEAR_UP) | - (1ULL << WIDX_YEAR_DOWN) | - (1ULL << WIDX_DAY_BOX) | - (1ULL << WIDX_DAY_UP) | - (1ULL << WIDX_DAY_DOWN) | - (1ULL << WIDX_DATE_GROUP) | - (1ULL << WIDX_DATE_RESET), - - MAIN_CHEAT_ENABLED_WIDGETS | - (1ULL << WIDX_GUEST_PARAMETERS_GROUP) | - (1ULL << WIDX_GUEST_HAPPINESS_MAX) | - (1ULL << WIDX_GUEST_HAPPINESS_MIN) | - (1ULL << WIDX_GUEST_ENERGY_MAX) | - (1ULL << WIDX_GUEST_ENERGY_MIN) | - (1ULL << WIDX_GUEST_HUNGER_MAX) | - (1ULL << WIDX_GUEST_HUNGER_MIN) | - (1ULL << WIDX_GUEST_THIRST_MAX) | - (1ULL << WIDX_GUEST_THIRST_MIN) | - (1ULL << WIDX_GUEST_NAUSEA_MAX) | - (1ULL << WIDX_GUEST_NAUSEA_MIN) | - (1ULL << WIDX_GUEST_NAUSEA_TOLERANCE_MAX) | - (1ULL << WIDX_GUEST_NAUSEA_TOLERANCE_MIN) | - (1ULL << WIDX_GUEST_TOILET_MAX) | - (1ULL << WIDX_GUEST_TOILET_MIN) | - (1ULL << WIDX_GUEST_RIDE_INTENSITY_MORE_THAN_1) | - (1ULL << WIDX_GUEST_RIDE_INTENSITY_LESS_THAN_15) | - (1ULL << WIDX_GUEST_IGNORE_RIDE_INTENSITY) | - (1ULL << WIDX_GIVE_ALL_GUESTS_GROUP) | - (1ULL << WIDX_GIVE_GUESTS_MONEY) | - (1ULL << WIDX_GIVE_GUESTS_PARK_MAPS) | - (1ULL << WIDX_GIVE_GUESTS_BALLOONS) | - (1ULL << WIDX_GIVE_GUESTS_UMBRELLAS) | - (1ULL << WIDX_TRAM_GUESTS) | - (1ULL << WIDX_REMOVE_ALL_GUESTS) | - (1ULL << WIDX_DISABLE_VANDALISM) | - (1ULL << WIDX_DISABLE_LITTERING), - - MAIN_CHEAT_ENABLED_WIDGETS | - (1ULL << WIDX_FREEZE_WEATHER) | - (1ULL << WIDX_OPEN_CLOSE_PARK) | - (1ULL << WIDX_CREATE_DUCKS) | - (1ULL << WIDX_REMOVE_DUCKS) | - (1ULL << WIDX_WEATHER) | - (1ULL << WIDX_WEATHER_DROPDOWN_BUTTON) | - (1ULL << WIDX_CLEAR_GRASS) | - (1ULL << WIDX_MOWED_GRASS) | - (1ULL << WIDX_WATER_PLANTS) | - (1ULL << WIDX_DISABLE_PLANT_AGING) | - (1ULL << WIDX_FIX_VANDALISM) | - (1ULL << WIDX_REMOVE_LITTER) | - (1ULL << WIDX_WIN_SCENARIO) | - (1ULL << WIDX_HAVE_FUN) | - (1ULL << WIDX_OWN_ALL_LAND) | - (1ULL << WIDX_NEVERENDING_MARKETING) | - (1ULL << WIDX_STAFF_SPEED) | - (1ULL << WIDX_STAFF_SPEED_DROPDOWN_BUTTON) | - (1ULL << WIDX_FORCE_PARK_RATING) | - (1ULL << WIDX_INCREASE_PARK_RATING) | - (1ULL << WIDX_DECREASE_PARK_RATING), - - MAIN_CHEAT_ENABLED_WIDGETS | - (1ULL << WIDX_RENEW_RIDES) | - (1ULL << WIDX_MAKE_DESTRUCTIBLE) | - (1ULL << WIDX_FIX_ALL) | - (1ULL << WIDX_UNLOCK_OPERATING_LIMITS) | - (1ULL << WIDX_DISABLE_BRAKES_FAILURE) | - (1ULL << WIDX_DISABLE_ALL_BREAKDOWNS) | - (1ULL << WIDX_BUILD_IN_PAUSE_MODE) | - (1ULL << WIDX_RESET_CRASH_STATUS) | - (1ULL << WIDX_10_MINUTE_INSPECTIONS) | - (1ULL << WIDX_SHOW_ALL_OPERATING_MODES) | - (1ULL << WIDX_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES) | - (1ULL << WIDX_DISABLE_TRAIN_LENGTH_LIMITS) | - (1ULL << WIDX_ENABLE_CHAIN_LIFT_ON_ALL_TRACK) | - (1ULL << WIDX_ENABLE_ARBITRARY_RIDE_TYPE_CHANGES) | - (1ULL << WIDX_DISABLE_RIDE_VALUE_AGING) | - (1ULL << WIDX_IGNORE_RESEARCH_STATUS) | - (1ULL << WIDX_ENABLE_ALL_DRAWABLE_TRACK_PIECES) | - (1ULL << WIDX_ALLOW_TRACK_PLACE_INVALID_HEIGHTS), -}; - static uint64_t window_cheats_page_hold_down_widgets[] = { (1ULL << WIDX_MONEY_SPINNER_INCREMENT) | (1ULL << WIDX_MONEY_SPINNER_DECREMENT) | @@ -705,7 +607,6 @@ private: page = p; frame_no = 0; - enabled_widgets = window_cheats_page_enabled_widgets[p]; hold_down_widgets = window_cheats_page_hold_down_widgets[p]; pressed_widgets = 0; widgets = window_cheats_page_widgets[p]; diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index b53bcc243f..0333dba9da 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -64,8 +64,6 @@ public: void OnOpen() override { widgets = window_clear_scenery_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_DECREMENT) | (1ULL << WIDX_PREVIEW) - | (1ULL << WIDX_SMALL_SCENERY) | (1ULL << WIDX_LARGE_SCENERY) | (1ULL << WIDX_FOOTPATH); hold_down_widgets = (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_DECREMENT); WindowInitScrollWidgets(this); window_push_others_below(this); diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index c93427268a..6bad05367f 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -52,8 +52,6 @@ public: void OnOpen() override { widgets = window_custom_currency_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_RATE) | (1ULL << WIDX_RATE_UP) | (1ULL << WIDX_RATE_DOWN) - | (1ULL << WIDX_SYMBOL_TEXT) | (1ULL << WIDX_AFFIX_DROPDOWN) | (1ULL << WIDX_AFFIX_DROPDOWN_BUTTON); hold_down_widgets = (1ULL << WIDX_RATE_UP) | (1ULL << WIDX_RATE_DOWN); WindowInitScrollWidgets(this); colours[0] = COLOUR_LIGHT_BROWN; diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 259ec8e570..deebb1b1f1 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -71,9 +71,6 @@ rct_window* WindowDebugPaintOpen() &window_debug_paint_events, WC_DEBUG_PAINT, WF_STICK_TO_FRONT | WF_TRANSPARENT); window->widgets = window_debug_paint_widgets; - window->enabled_widgets = (1ULL << WIDX_TOGGLE_SHOW_WIDE_PATHS) | (1ULL << WIDX_TOGGLE_SHOW_BLOCKED_TILES) - | (1ULL << WIDX_TOGGLE_SHOW_BOUND_BOXES) | (1ULL << WIDX_TOGGLE_SHOW_SEGMENT_HEIGHTS) - | (1ULL << WIDX_TOGGLE_SHOW_DIRTY_VISUALS); WindowInitScrollWidgets(window); window_push_others_below(window); diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index 6cca93194d..7068f5e823 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -53,7 +53,6 @@ public: void OnOpen() override { widgets = window_ride_demolish_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_CANCEL) | (1ULL << WIDX_DEMOLISH); WindowInitScrollWidgets(this); } diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 15dc21cd32..45001c8ee2 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -110,9 +110,6 @@ rct_window* WindowEditorBottomToolbarOpen() WC_BOTTOM_TOOLBAR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND); window->widgets = window_editor_bottom_toolbar_widgets; - window->enabled_widgets |= (1ULL << WIDX_PREVIOUS_STEP_BUTTON) | (1ULL << WIDX_NEXT_STEP_BUTTON) - | (1ULL << WIDX_PREVIOUS_IMAGE) | (1ULL << WIDX_NEXT_IMAGE); - WindowInitScrollWidgets(window); set_all_scenery_items_invented(); diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 53039ef9c4..b377b53ae1 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -257,8 +257,6 @@ rct_window* WindowEditorInventionsListOpen() w = WindowCreateCentred( WW, WH, &window_editor_inventions_list_events, WC_EDITOR_INVENTION_LIST, WF_NO_SCROLLING | WF_RESIZABLE); w->widgets = window_editor_inventions_list_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_RESIZE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_RANDOM_SHUFFLE) - | (1ULL << WIDX_MOVE_ITEMS_TO_BOTTOM) | (1ULL << WIDX_MOVE_ITEMS_TO_TOP); WindowInitScrollWidgets(w); w->selected_tab = 0; w->research_item = nullptr; diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 40ecfe3c20..11e5285e52 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -243,19 +243,11 @@ public: sub_6AB211(); reset_selected_object_count_and_size(); - enabled_widgets = (1ULL << WIDX_ADVANCED) | (1ULL << WIDX_INSTALL_TRACK) | (1ULL << WIDX_FILTER_DROPDOWN) - | (1ULL << WIDX_FILTER_TEXT_BOX) | (1ULL << WIDX_FILTER_CLEAR_BUTTON) | (1ULL << WIDX_CLOSE) - | (1ULL << WIDX_LIST_SORT_TYPE) | (1UL << WIDX_LIST_SORT_RIDE); - widgets[WIDX_FILTER_TEXT_BOX].string = _filter_string; _filter_flags = gConfigInterface.object_selection_filter_flags; std::fill_n(_filter_string, sizeof(_filter_string), 0x00); - for (size_t i = WIDX_TAB_1; i < WIDX_TAB_1 + std::size(ObjectSelectionPages); i++) - { - enabled_widgets |= (1LL << i); - } WindowInitScrollWidgets(this); selected_tab = 0; @@ -886,11 +878,6 @@ public: if (ridePage) { - enabled_widgets |= (1ULL << WIDX_FILTER_RIDE_TAB_ALL) | (1ULL << WIDX_FILTER_RIDE_TAB_TRANSPORT) - | (1ULL << WIDX_FILTER_RIDE_TAB_GENTLE) | (1ULL << WIDX_FILTER_RIDE_TAB_COASTER) - | (1ULL << WIDX_FILTER_RIDE_TAB_THRILL) | (1ULL << WIDX_FILTER_RIDE_TAB_WATER) - | (1ULL << WIDX_FILTER_RIDE_TAB_STALL); - for (int32_t i = 0; i < 7; i++) pressed_widgets &= ~(1 << (WIDX_FILTER_RIDE_TAB_ALL + i)); @@ -927,11 +914,6 @@ public: } else { - enabled_widgets &= ~( - (1ULL << WIDX_FILTER_RIDE_TAB_ALL) | (1ULL << WIDX_FILTER_RIDE_TAB_TRANSPORT) - | (1ULL << WIDX_FILTER_RIDE_TAB_GENTLE) | (1ULL << WIDX_FILTER_RIDE_TAB_COASTER) - | (1ULL << WIDX_FILTER_RIDE_TAB_THRILL) | (1ULL << WIDX_FILTER_RIDE_TAB_WATER) - | (1ULL << WIDX_FILTER_RIDE_TAB_STALL)); for (int32_t i = WIDX_FILTER_RIDE_TAB_FRAME; i <= WIDX_FILTER_RIDE_TAB_STALL; i++) widgets[i].type = WindowWidgetType::Empty; diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index e5d63b9722..2a6009968d 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -176,27 +176,6 @@ static rct_window_event_list *window_editor_objective_options_page_events[] = { #pragma region Enabled widgets -static uint64_t window_editor_objective_options_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_OBJECTIVE) | - (1ULL << WIDX_OBJECTIVE_DROPDOWN) | - (1ULL << WIDX_OBJECTIVE_ARG_1_INCREASE) | - (1ULL << WIDX_OBJECTIVE_ARG_1_DECREASE) | - (1ULL << WIDX_OBJECTIVE_ARG_2_INCREASE) | - (1ULL << WIDX_OBJECTIVE_ARG_2_DECREASE) | - (1ULL << WIDX_PARK_NAME) | - (1ULL << WIDX_SCENARIO_NAME) | - (1ULL << WIDX_CATEGORY) | - (1ULL << WIDX_CATEGORY_DROPDOWN) | - (1ULL << WIDX_DETAILS), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2), -}; - static uint64_t window_editor_objective_options_page_hold_down_widgets[] = { (1ULL << WIDX_OBJECTIVE_ARG_1_INCREASE) | (1ULL << WIDX_OBJECTIVE_ARG_1_DECREASE) | @@ -225,7 +204,6 @@ rct_window* WindowEditorObjectiveOptionsOpen() w = WindowCreateCentred(450, 228, &window_objective_options_main_events, WC_EDITOR_OBJECTIVE_OPTIONS, WF_10); w->widgets = window_editor_objective_options_main_widgets; - w->enabled_widgets = window_editor_objective_options_page_enabled_widgets[WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN]; w->pressed_widgets = 0; w->hold_down_widgets = window_editor_objective_options_page_hold_down_widgets[WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_MAIN]; WindowInitScrollWidgets(w); @@ -296,7 +274,6 @@ static void WindowEditorObjectiveOptionsSetPage(rct_window* w, int32_t page) w->var_492 = 0; w->no_list_items = 0; w->selected_list_item = -1; - w->enabled_widgets = window_editor_objective_options_page_enabled_widgets[page]; w->hold_down_widgets = window_editor_objective_options_page_hold_down_widgets[page]; w->event_handlers = window_editor_objective_options_page_events[page]; w->widgets = window_editor_objective_options_widgets[page]; diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 9d89476433..69d8efb91d 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -245,53 +245,6 @@ static rct_window_event_list *window_editor_scenario_options_page_events[] = { #pragma region Enabled widgets -#define ALWAYS_ENABLED_WIDGETS \ - (1ULL << WIDX_CLOSE) |\ - (1ULL << WIDX_TAB_1) |\ - (1ULL << WIDX_TAB_2) |\ - (1ULL << WIDX_TAB_3) - -static uint64_t window_editor_scenario_options_page_enabled_widgets[] = { - ALWAYS_ENABLED_WIDGETS | - (1ULL << WIDX_NO_MONEY) | - (1ULL << WIDX_INITIAL_CASH_INCREASE) | - (1ULL << WIDX_INITIAL_CASH_DECREASE) | - (1ULL << WIDX_INITIAL_LOAN_INCREASE) | - (1ULL << WIDX_INITIAL_LOAN_DECREASE) | - (1ULL << WIDX_MAXIMUM_LOAN_INCREASE) | - (1ULL << WIDX_MAXIMUM_LOAN_DECREASE) | - (1ULL << WIDX_INTEREST_RATE_INCREASE) | - (1ULL << WIDX_INTEREST_RATE_DECREASE) | - (1ULL << WIDX_FORBID_MARKETING), - ALWAYS_ENABLED_WIDGETS | - (1ULL << WIDX_CASH_PER_GUEST_INCREASE) | - (1ULL << WIDX_CASH_PER_GUEST_DECREASE) | - (1ULL << WIDX_GUEST_INITIAL_HAPPINESS_INCREASE) | - (1ULL << WIDX_GUEST_INITIAL_HAPPINESS_DECREASE) | - (1ULL << WIDX_GUEST_INITIAL_HUNGER_INCREASE) | - (1ULL << WIDX_GUEST_INITIAL_HUNGER_DECREASE) | - (1ULL << WIDX_GUEST_INITIAL_THIRST_INCREASE) | - (1ULL << WIDX_GUEST_INITIAL_THIRST_DECREASE) | - (1ULL << WIDX_GUEST_PREFER_LESS_INTENSE_RIDES) | - (1ULL << WIDX_GUEST_PREFER_MORE_INTENSE_RIDES), - ALWAYS_ENABLED_WIDGETS | - (1ULL << WIDX_LAND_COST_INCREASE) | - (1ULL << WIDX_LAND_COST_DECREASE) | - (1ULL << WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE) | - (1ULL << WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE) | - (1ULL << WIDX_PAY_FOR_PARK_OR_RIDES) | - (1ULL << WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN) | - (1ULL << WIDX_ENTRY_PRICE_INCREASE) | - (1ULL << WIDX_ENTRY_PRICE_DECREASE) | - (1ULL << WIDX_CLIMATE) | - (1ULL << WIDX_CLIMATE_DROPDOWN) | - (1ULL << WIDX_FORBID_TREE_REMOVAL) | - (1ULL << WIDX_FORBID_LANDSCAPE_CHANGES) | - (1ULL << WIDX_FORBID_HIGH_CONSTRUCTION) | - (1ULL << WIDX_HARD_PARK_RATING) | - (1ULL << WIDX_HARD_GUEST_GENERATION), -}; - static uint32_t window_editor_scenario_options_page_hold_down_widgets[] = { (1ULL << WIDX_INITIAL_CASH_INCREASE) | (1ULL << WIDX_INITIAL_CASH_DECREASE) | @@ -335,7 +288,6 @@ rct_window* WindowEditorScenarioOptionsOpen() w = WindowCreateCentred( 280, 148, window_editor_scenario_options_page_events[0], WC_EDITOR_SCENARIO_OPTIONS, WF_NO_SCROLLING); w->widgets = window_editor_scenario_options_widgets[0]; - w->enabled_widgets = window_editor_scenario_options_page_enabled_widgets[0]; w->hold_down_widgets = window_editor_scenario_options_page_hold_down_widgets[0]; WindowInitScrollWidgets(w); w->page = 0; @@ -405,7 +357,6 @@ static void WindowEditorScenarioOptionsSetPage(rct_window* w, int32_t page) w->page = page; w->frame_no = 0; w->var_492 = 0; - w->enabled_widgets = window_editor_scenario_options_page_enabled_widgets[page]; w->hold_down_widgets = window_editor_scenario_options_page_hold_down_widgets[page]; w->event_handlers = window_editor_scenario_options_page_events[page]; w->widgets = window_editor_scenario_options_widgets[page]; diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index cd7df218de..b69782890b 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -282,51 +282,6 @@ static rct_window_event_list *const _windowFinancesPageEvents[] = &_windowFinancesResearchEvents }; -#pragma endregion - -#pragma region Enabled widgets - -#define ALWAYS_ENABLED_WIDGETS \ - ((1ULL << WIDX_CLOSE) | \ - (1ULL << WIDX_TAB_1) | \ - (1ULL << WIDX_TAB_2) | \ - (1ULL << WIDX_TAB_3) | \ - (1ULL << WIDX_TAB_4) | \ - (1ULL << WIDX_TAB_5) | \ - (1ULL << WIDX_TAB_6)) - -static constexpr const uint32_t WindowFinancesPageEnabledWidgets[] = -{ - ALWAYS_ENABLED_WIDGETS | - (1ULL << WIDX_SUMMARY_SCROLL) | - (1ULL << WIDX_LOAN_INCREASE) | - (1ULL << WIDX_LOAN_DECREASE), - - ALWAYS_ENABLED_WIDGETS, - - ALWAYS_ENABLED_WIDGETS, - - ALWAYS_ENABLED_WIDGETS, - - ALWAYS_ENABLED_WIDGETS | - (1ULL << WIDX_CAMPAIGN_1) | - (1ULL << WIDX_CAMPAIGN_2) | - (1ULL << WIDX_CAMPAIGN_3) | - (1ULL << WIDX_CAMPAIGN_4) | - (1ULL << WIDX_CAMPAIGN_5) | - (1ULL << WIDX_CAMPAIGN_6), - - ALWAYS_ENABLED_WIDGETS | - (1ULL << WIDX_RESEARCH_FUNDING) | - (1ULL << WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON) | - (1ULL << WIDX_TRANSPORT_RIDES) | - (1ULL << WIDX_GENTLE_RIDES) | - (1ULL << WIDX_ROLLER_COASTERS) | - (1ULL << WIDX_THRILL_RIDES) | - (1ULL << WIDX_WATER_RIDES) | - (1ULL << WIDX_SHOPS_AND_STALLS) | - (1ULL << WIDX_SCENERY_AND_THEMING) -}; static constexpr const uint32_t WindowFinancesPageHoldDownWidgets[] = { @@ -398,7 +353,6 @@ rct_window* WindowFinancesOpen() w->Invalidate(); w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; - w->enabled_widgets = WindowFinancesPageEnabledWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; w->hold_down_widgets = WindowFinancesPageHoldDownWidgets[WINDOW_FINANCES_PAGE_SUMMARY]; w->event_handlers = _windowFinancesPageEvents[WINDOW_FINANCES_PAGE_SUMMARY]; w->pressed_widgets = 0; @@ -1314,7 +1268,6 @@ static void WindowFinancesSetPage(rct_window* w, int32_t page) w->frame_no = 0; w->RemoveViewport(); - w->enabled_widgets = WindowFinancesPageEnabledWidgets[page]; w->hold_down_widgets = WindowFinancesPageHoldDownWidgets[page]; w->event_handlers = _windowFinancesPageEvents[page]; w->widgets = _windowFinancesPageWidgets[page]; diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 61264c4fdc..e1ddb00f91 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -207,11 +207,6 @@ rct_window* WindowFootpathOpen() window = WindowCreate(ScreenCoordsXY(0, 29), WW, WH, &window_footpath_events, WC_FOOTPATH, 0); window->widgets = window_footpath_widgets; - window->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_FOOTPATH_TYPE) | (1ULL << WIDX_QUEUELINE_TYPE) - | (1ULL << WIDX_RAILINGS_TYPE) | (1ULL << WIDX_DIRECTION_NW) | (1ULL << WIDX_DIRECTION_NE) | (1ULL << WIDX_DIRECTION_SW) - | (1ULL << WIDX_DIRECTION_SE) | (1ULL << WIDX_SLOPEDOWN) | (1ULL << WIDX_LEVEL) | (1ULL << WIDX_SLOPEUP) - | (1ULL << WIDX_CONSTRUCT) | (1ULL << WIDX_REMOVE) | (1ULL << WIDX_CONSTRUCT_ON_LAND) - | (1ULL << WIDX_CONSTRUCT_BRIDGE_OR_TUNNEL); WindowInitScrollWidgets(window); window_push_others_right(window); diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index e045a996e2..a0a20bb667 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -118,9 +118,6 @@ rct_window* WindowGameBottomToolbarOpen() ScreenCoordsXY(0, screenHeight - toolbar_height), screenWidth, toolbar_height, &window_game_bottom_toolbar_events, WC_BOTTOM_TOOLBAR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND); window->widgets = window_game_bottom_toolbar_widgets; - window->enabled_widgets |= (1ULL << WIDX_LEFT_OUTSET) | (1ULL << WIDX_MONEY) | (1ULL << WIDX_GUESTS) - | (1ULL << WIDX_PARK_RATING) | (1ULL << WIDX_MIDDLE_OUTSET) | (1ULL << WIDX_MIDDLE_INSET) | (1ULL << WIDX_NEWS_SUBJECT) - | (1ULL << WIDX_NEWS_LOCATE) | (1ULL << WIDX_RIGHT_OUTSET) | (1ULL << WIDX_DATE); window->frame_no = 0; WindowInitScrollWidgets(window); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 4e7fa4c518..7ca76c7783 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -273,78 +273,6 @@ static rct_window_event_list* window_guest_page_events[] = { &window_guest_debug_events, }; -void WindowGuestSetColours(); - -// 0x981D3C -static constexpr const uint32_t window_guest_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7) | - (1ULL << WIDX_RENAME)| - (1ULL << WIDX_PICKUP)| - (1ULL << WIDX_LOCATE)| - (1ULL << WIDX_TRACK), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7) | - (1ULL << WIDX_RIDE_SCROLL), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), -}; // clang-format on static constexpr const rct_size16 window_guest_page_sizes[][2] = { @@ -357,6 +285,8 @@ static constexpr const rct_size16 window_guest_page_sizes[][2] = { { 192, 171, 192, 171 }, // WINDOW_GUEST_DEBUG }; +void WindowGuestSetColours(); + static Guest* GetGuest(rct_window* w) { auto guest = GetEntity(w->number); @@ -395,7 +325,6 @@ rct_window* WindowGuestOpen(Peep* peep) window = WindowCreateAutoPos(windowWidth, 157, &window_guest_overview_events, WC_PEEP, WF_RESIZABLE); window->widgets = window_guest_overview_widgets; - window->enabled_widgets = window_guest_page_enabled_widgets[0]; window->number = peep->sprite_index; window->page = 0; window->frame_no = 0; @@ -415,7 +344,6 @@ rct_window* WindowGuestOpen(Peep* peep) window->Invalidate(); window->widgets = window_guest_page_widgets[WINDOW_GUEST_OVERVIEW]; - window->enabled_widgets = window_guest_page_enabled_widgets[WINDOW_GUEST_OVERVIEW]; window->hold_down_widgets = 0; window->event_handlers = window_guest_page_events[WINDOW_GUEST_OVERVIEW]; window->pressed_widgets = 0; @@ -690,7 +618,6 @@ void WindowGuestSetPage(rct_window* w, int32_t page) w->RemoveViewport(); - w->enabled_widgets = window_guest_page_enabled_widgets[page]; w->hold_down_widgets = 0; w->event_handlers = window_guest_page_events[page]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 545912e2a1..9cfc288b5e 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -154,9 +154,6 @@ public: void OnOpen() override { widgets = window_guest_list_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_PAGE_DROPDOWN) | (1ULL << WIDX_PAGE_DROPDOWN_BUTTON) - | (1ULL << WIDX_INFO_TYPE_DROPDOWN) | (1ULL << WIDX_INFO_TYPE_DROPDOWN_BUTTON) | (1ULL << WIDX_MAP) - | (1ULL << WIDX_TRACKING) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_FILTER_BY_NAME); WindowInitScrollWidgets(this); _selectedTab = TabId::Individual; diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 5add51362c..842ab40607 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -118,8 +118,6 @@ rct_window* WindowInstallTrackOpen(const utf8* path) rct_window* w = WindowCreate(ScreenCoordsXY(x, y), WW, WH, &window_install_track_events, WC_INSTALL_TRACK, 0); w->widgets = window_install_track_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_ROTATE) | (1ULL << WIDX_TOGGLE_SCENERY) | (1ULL << WIDX_INSTALL) - | (1ULL << WIDX_CANCEL); WindowInitScrollWidgets(w); w->track_list.track_list_being_updated = false; window_push_others_right(w); diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 28d268e005..2856f6c6a5 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -70,8 +70,6 @@ public: void OnOpen() override { widgets = window_land_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_DECREMENT) | (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_FLOOR) - | (1ULL << WIDX_WALL) | (1ULL << WIDX_MOUNTAINMODE) | (1ULL << WIDX_PAINTMODE) | (1ULL << WIDX_PREVIEW); hold_down_widgets = (1ULL << WIDX_DECREMENT) | (1ULL << WIDX_INCREMENT); WindowInitScrollWidgets(this); window_push_others_below(this); diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 50a2d0397c..704032f3b1 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -58,8 +58,6 @@ public: void OnOpen() override { widgets = window_land_rights_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_DECREMENT) | (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_PREVIEW) - | (1ULL << WIDX_BUY_LAND_RIGHTS) | (1ULL << WIDX_BUY_CONSTRUCTION_RIGHTS); hold_down_widgets = (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_DECREMENT); WindowInitScrollWidgets(this); window_push_others_below(this); diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index a75e57c0f6..cdce0b983b 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -270,8 +270,6 @@ rct_window* WindowLoadsaveOpen( { w = WindowCreateCentred(WW, WH, &window_loadsave_events, WC_LOADSAVE, WF_STICK_TO_FRONT | WF_RESIZABLE); w->widgets = window_loadsave_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_UP) | (1ULL << WIDX_NEW_FOLDER) | (1ULL << WIDX_NEW_FILE) - | (1ULL << WIDX_SORT_NAME) | (1ULL << WIDX_SORT_DATE) | (1ULL << WIDX_BROWSE) | (1ULL << WIDX_DEFAULT); w->min_width = WW; w->min_height = WH / 2; @@ -280,7 +278,6 @@ rct_window* WindowLoadsaveOpen( if (!hasFilePicker) { - w->enabled_widgets &= ~(1ULL << WIDX_BROWSE); w->disabled_widgets |= (1ULL << WIDX_BROWSE); window_loadsave_widgets[WIDX_BROWSE].type = WindowWidgetType::Empty; } @@ -1163,7 +1160,6 @@ static rct_window* WindowOverwritePromptOpen(const char* name, const char* path) w = WindowCreateCentred( OVERWRITE_WW, OVERWRITE_WH, &window_overwrite_prompt_events, WC_LOADSAVE_OVERWRITE_PROMPT, WF_STICK_TO_FRONT); w->widgets = window_overwrite_prompt_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_OVERWRITE_CANCEL) | (1ULL << WIDX_OVERWRITE_OVERWRITE); WindowInitScrollWidgets(w); diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 40edfaff83..afe22dd403 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -243,13 +243,6 @@ rct_window* WindowMapOpen() w = WindowCreateAutoPos(245, 259, &window_map_events, WC_MAP, WF_10); w->widgets = window_map_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_PEOPLE_TAB) | (1ULL << WIDX_RIDES_TAB) - | (1ULL << WIDX_MAP_SIZE_SPINNER) | (1ULL << WIDX_MAP_SIZE_SPINNER_UP) | (1ULL << WIDX_MAP_SIZE_SPINNER_DOWN) - | (1ULL << WIDX_LAND_TOOL) | (1ULL << WIDX_LAND_TOOL_SMALLER) | (1ULL << WIDX_LAND_TOOL_LARGER) - | (1ULL << WIDX_SET_LAND_RIGHTS) | (1ULL << WIDX_LAND_OWNED_CHECKBOX) - | (1ULL << WIDX_CONSTRUCTION_RIGHTS_OWNED_CHECKBOX) | (1ULL << WIDX_LAND_SALE_CHECKBOX) - | (1ULL << WIDX_CONSTRUCTION_RIGHTS_SALE_CHECKBOX) | (1ULL << WIDX_BUILD_PARK_ENTRANCE) | (1ULL << WIDX_ROTATE_90) - | (1ULL << WIDX_PEOPLE_STARTING_POSITION) | (1ULL << WIDX_MAP_GENERATOR); w->hold_down_widgets = (1ULL << WIDX_MAP_SIZE_SPINNER_UP) | (1ULL << WIDX_MAP_SIZE_SPINNER_DOWN) | (1ULL << WIDX_LAND_TOOL_LARGER) | (1ULL << WIDX_LAND_TOOL_SMALLER); diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 4ae2c82e2f..f61734d6e4 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -262,75 +262,9 @@ static rct_window_event_list* PageEvents[] = { #pragma endregion -#pragma region Enabled widgets +#pragma region Widget flags // clang-format off -static uint64_t PageEnabledWidgets[WINDOW_MAPGEN_PAGE_COUNT] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_MAP_GENERATE) | - (1ULL << WIDX_MAP_SIZE) | - (1ULL << WIDX_MAP_SIZE_UP) | - (1ULL << WIDX_MAP_SIZE_DOWN) | - (1ULL << WIDX_BASE_HEIGHT) | - (1ULL << WIDX_BASE_HEIGHT_UP) | - (1ULL << WIDX_BASE_HEIGHT_DOWN) | - (1ULL << WIDX_WATER_LEVEL) | - (1ULL << WIDX_WATER_LEVEL_UP) | - (1ULL << WIDX_WATER_LEVEL_DOWN) | - (1ULL << WIDX_FLOOR_TEXTURE) | - (1ULL << WIDX_WALL_TEXTURE), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_RANDOM_GENERATE) | - (1ULL << WIDX_RANDOM_TERRAIN) | - (1ULL << WIDX_RANDOM_PLACE_TREES), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_SIMPLEX_GENERATE) | - (1ULL << WIDX_SIMPLEX_LABEL) | - (1ULL << WIDX_SIMPLEX_LOW) | - (1ULL << WIDX_SIMPLEX_LOW_UP) | - (1ULL << WIDX_SIMPLEX_LOW_DOWN) | - (1ULL << WIDX_SIMPLEX_HIGH) | - (1ULL << WIDX_SIMPLEX_HIGH_UP) | - (1ULL << WIDX_SIMPLEX_HIGH_DOWN) | - (1ULL << WIDX_SIMPLEX_BASE_FREQ) | - (1ULL << WIDX_SIMPLEX_BASE_FREQ_UP) | - (1ULL << WIDX_SIMPLEX_BASE_FREQ_DOWN) | - (1ULL << WIDX_SIMPLEX_OCTAVES) | - (1ULL << WIDX_SIMPLEX_OCTAVES_UP) | - (1ULL << WIDX_SIMPLEX_OCTAVES_DOWN) | - (1ULL << WIDX_SIMPLEX_MAP_SIZE) | - (1ULL << WIDX_SIMPLEX_MAP_SIZE_UP) | - (1ULL << WIDX_SIMPLEX_MAP_SIZE_DOWN) | - (1ULL << WIDX_SIMPLEX_WATER_LEVEL) | - (1ULL << WIDX_SIMPLEX_WATER_LEVEL_UP) | - (1ULL << WIDX_SIMPLEX_WATER_LEVEL_DOWN) | - (1ULL << WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX) | - (1ULL << WIDX_SIMPLEX_FLOOR_TEXTURE) | - (1ULL << WIDX_SIMPLEX_WALL_TEXTURE) | - (1ULL << WIDX_SIMPLEX_PLACE_TREES_CHECKBOX), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_HEIGHTMAP_SELECT) -}; - static uint64_t PageDisabledWidgets[WINDOW_MAPGEN_PAGE_COUNT] = { 0, @@ -464,7 +398,6 @@ rct_window* WindowMapgenOpen() w->page = WINDOW_MAPGEN_PAGE_BASE; w->Invalidate(); w->widgets = PageWidgets[WINDOW_MAPGEN_PAGE_BASE]; - w->enabled_widgets = PageEnabledWidgets[WINDOW_MAPGEN_PAGE_BASE]; w->hold_down_widgets = HoldDownWidgets[WINDOW_MAPGEN_PAGE_BASE]; w->event_handlers = PageEvents[WINDOW_MAPGEN_PAGE_BASE]; w->pressed_widgets = PressedWidgets[WINDOW_MAPGEN_PAGE_BASE]; @@ -1304,7 +1237,6 @@ static void WindowMapgenSetPage(rct_window* w, int32_t page) w->frame_no = 0; w->RemoveViewport(); - w->enabled_widgets = PageEnabledWidgets[page]; w->hold_down_widgets = HoldDownWidgets[page]; w->event_handlers = PageEvents[page]; w->widgets = PageWidgets[page]; diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index cc10083bf5..7a3e00cd9e 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -92,10 +92,6 @@ public: void OnOpen() override { widgets = window_maze_construction_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_MAZE_BUILD_MODE) | (1ULL << WIDX_MAZE_MOVE_MODE) - | (1ULL << WIDX_MAZE_FILL_MODE) | (1ULL << WIDX_MAZE_DIRECTION_NW) | (1ULL << WIDX_MAZE_DIRECTION_NE) - | (1ULL << WIDX_MAZE_DIRECTION_SW) | (1ULL << WIDX_MAZE_DIRECTION_SE) | (1ULL << WIDX_MAZE_ENTRANCE) - | (1ULL << WIDX_MAZE_EXIT); WindowInitScrollWidgets(this); rideId = _currentRideIndex; show_gridlines(); diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index dc0fc15cb6..f077d48720 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -110,13 +110,6 @@ static rct_widget *window_multiplayer_page_widgets[] = { window_multiplayer_options_widgets, }; -static constexpr const uint64_t window_multiplayer_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) | (1ULL << WIDX_TAB4), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) | (1ULL << WIDX_TAB4), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) | (1ULL << WIDX_TAB4) | (1ULL << WIDX_DEFAULT_GROUP) | (1ULL << WIDX_DEFAULT_GROUP_DROPDOWN) | (1ULL << WIDX_ADD_GROUP) | (1ULL << WIDX_REMOVE_GROUP) | (1ULL << WIDX_RENAME_GROUP) | (1ULL << WIDX_SELECTED_GROUP) | (1ULL << WIDX_SELECTED_GROUP_DROPDOWN), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) | (1ULL << WIDX_TAB4) | (1ULL << WIDX_LOG_CHAT_CHECKBOX) | (1ULL << WIDX_LOG_SERVER_ACTIONS_CHECKBOX) | (1ULL << WIDX_KNOWN_KEYS_ONLY_CHECKBOX), -}; - static constexpr rct_string_id WindowMultiplayerPageTitles[] = { STR_MULTIPLAYER_INFORMATION_TITLE, STR_MULTIPLAYER_PLAYERS_TITLE, @@ -257,7 +250,6 @@ static void WindowMultiplayerSetPage(rct_window* w, int32_t page) w->no_list_items = 0; w->selected_list_item = -1; - w->enabled_widgets = window_multiplayer_page_enabled_widgets[page]; w->hold_down_widgets = 0; w->event_handlers = window_multiplayer_page_events[page]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index a3899c937b..80a453567a 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -66,7 +66,6 @@ rct_window* WindowNetworkStatusOpen(const char* text, close_callback onClose) window = WindowCreateCentred(420, 90, &window_network_status_events, WC_NETWORK_STATUS, WF_10 | WF_TRANSPARENT); window->widgets = window_network_status_widgets; - window->enabled_widgets = 1ULL << WIDX_CLOSE; WindowInitScrollWidgets(window); window->no_list_items = 0; window->selected_list_item = -1; diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index c04707b059..8e7c73ffc8 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -155,8 +155,6 @@ public: void OnOpen() override { widgets = window_new_campaign_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_RIDE_DROPDOWN) | (1ULL << WIDX_RIDE_DROPDOWN_BUTTON) - | (1ULL << WIDX_WEEKS_INCREASE_BUTTON) | (1ULL << WIDX_WEEKS_DECREASE_BUTTON) | (1ULL << WIDX_START_BUTTON); hold_down_widgets = (1ULL << WIDX_WEEKS_INCREASE_BUTTON) | (1ULL << WIDX_WEEKS_DECREASE_BUTTON); WindowInitScrollWidgets(this); } diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index b5e378650e..c5190d42ba 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -437,9 +437,6 @@ rct_window* WindowNewRideOpen() w = WindowCreateAutoPos(WW, WH, &window_new_ride_events, WC_CONSTRUCT_RIDE, WF_10); w->widgets = window_new_ride_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) - | (1ULL << WIDX_TAB_4) | (1ULL << WIDX_TAB_5) | (1ULL << WIDX_TAB_6) | (1ULL << WIDX_TAB_7) - | (1ULL << WIDX_LAST_DEVELOPMENT_BUTTON) | (1ULL << WIDX_RESEARCH_FUNDING_BUTTON); WindowNewRidePopulateList(); WindowInitScrollWidgets(w); diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 9531ef085d..7af93494a4 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -57,7 +57,6 @@ public: void OnOpen() override { widgets = window_news_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_SETTINGS); WindowInitScrollWidgets(this); _pressedNewsItemIndex = -1; diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index da35f4747c..2d2b185a8c 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -68,9 +68,6 @@ enum WindowNewsOptionsWidgetIdx WIDX_CHECKBOX_0 }; -constexpr int MAIN_NEWS_OPTIONS_ENABLED_WIDGETS = - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_PARK) | (1ULL << WIDX_TAB_RIDE) | (1ULL << WIDX_TAB_GUEST); - static rct_widget WindowNewsOptionsWidgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), MakeWidget({ 0, 43}, {400, 257}, WindowWidgetType::Resize, WindowColour::Secondary), // Tab content panel @@ -96,7 +93,6 @@ public: void OnOpen() override { widgets = WindowNewsOptionsWidgets; - enabled_widgets = MAIN_NEWS_OPTIONS_ENABLED_WIDGETS; InitScrollWidgets(); colours[0] = COLOUR_GREY; colours[1] = COLOUR_LIGHT_BLUE; @@ -169,8 +165,6 @@ public: if (ndef->category != page) continue; - enabled_widgets |= (1ULL << checkboxWidgetIndex); - checkboxWidget->type = WindowWidgetType::Checkbox; checkboxWidget->left = baseCheckBox.left; checkboxWidget->right = baseCheckBox.right; @@ -189,8 +183,6 @@ public: // Remove unused checkboxes while (checkboxWidget->type != WindowWidgetType::Last) { - enabled_widgets &= ~(1ULL << checkboxWidgetIndex); - checkboxWidget->type = WindowWidgetType::Empty; checkboxWidgetIndex++; checkboxWidget++; diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index eefe40e74a..5ac427aa73 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -391,8 +391,6 @@ public: void OnOpen() override { widgets = window_object_load_error_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_COPY_CURRENT) | (1ULL << WIDX_COPY_ALL) - | (1ULL << WIDX_DOWNLOAD_ALL); WindowInitScrollWidgets(this); colours[0] = COLOUR_LIGHT_BLUE; diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 33dd920bda..d34c8f6c46 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -373,131 +373,12 @@ static rct_widget *window_options_page_widgets[] = { #pragma endregion -#pragma region Enabled Widgets - -constexpr int MAIN_OPTIONS_ENABLED_WIDGETS = - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_DISPLAY) | - (1ULL << WIDX_TAB_RENDERING) | - (1ULL << WIDX_TAB_CULTURE) | - (1ULL << WIDX_TAB_AUDIO) | - (1ULL << WIDX_TAB_CONTROLS_AND_INTERFACE) | - (1ULL << WIDX_TAB_MISC) | - (1ULL << WIDX_TAB_ADVANCED); - -static uint64_t window_options_page_enabled_widgets[] = { - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_RESOLUTION) | - (1ULL << WIDX_RESOLUTION_DROPDOWN) | - (1ULL << WIDX_FULLSCREEN) | - (1ULL << WIDX_FULLSCREEN_DROPDOWN) | - (1ULL << WIDX_DRAWING_ENGINE) | - (1ULL << WIDX_DRAWING_ENGINE_DROPDOWN) | - (1ULL << WIDX_UNCAP_FPS_CHECKBOX) | - (1ULL << WIDX_USE_VSYNC_CHECKBOX) | - (1ULL << WIDX_SHOW_FPS_CHECKBOX) | - (1ULL << WIDX_MULTITHREADING_CHECKBOX) | - (1ULL << WIDX_MINIMIZE_FOCUS_LOSS) | - (1ULL << WIDX_STEAM_OVERLAY_PAUSE) | - (1ULL << WIDX_DISABLE_SCREENSAVER_LOCK) | - (1ULL << WIDX_SCALE) | - (1ULL << WIDX_SCALE_UP) | - (1ULL << WIDX_SCALE_DOWN), - - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_TILE_SMOOTHING_CHECKBOX) | - (1ULL << WIDX_GRIDLINES_CHECKBOX) | - (1ULL << WIDX_UPPER_CASE_BANNERS_CHECKBOX) | - (1ULL << WIDX_SHOW_GUEST_PURCHASES_CHECKBOX) | - (1ULL << WIDX_TRANSPARENT_SCREENSHOTS_CHECKBOX) | - (1ULL << WIDX_VIRTUAL_FLOOR) | - (1ULL << WIDX_VIRTUAL_FLOOR_DROPDOWN) | - (1ULL << WIDX_DAY_NIGHT_CHECKBOX) | - (1ULL << WIDX_ENABLE_LIGHT_FX_CHECKBOX) | - (1ULL << WIDX_ENABLE_LIGHT_FX_FOR_VEHICLES_CHECKBOX) | - (1ULL << WIDX_RENDER_WEATHER_EFFECTS_CHECKBOX) | - (1ULL << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX), - - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_LANGUAGE) | - (1ULL << WIDX_LANGUAGE_DROPDOWN) | - (1ULL << WIDX_CURRENCY) | - (1ULL << WIDX_CURRENCY_DROPDOWN) | - (1ULL << WIDX_DISTANCE) | - (1ULL << WIDX_DISTANCE_DROPDOWN) | - (1ULL << WIDX_TEMPERATURE) | - (1ULL << WIDX_TEMPERATURE_DROPDOWN) | - (1ULL << WIDX_HEIGHT_LABELS) | - (1ULL << WIDX_HEIGHT_LABELS_DROPDOWN) | - (1ULL << WIDX_DATE_FORMAT) | - (1ULL << WIDX_DATE_FORMAT_DROPDOWN), - - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_SOUND) | - (1ULL << WIDX_SOUND_DROPDOWN) | - (1ULL << WIDX_MASTER_SOUND_CHECKBOX) | - (1ULL << WIDX_SOUND_CHECKBOX) | - (1ULL << WIDX_MUSIC_CHECKBOX) | - (1ULL << WIDX_AUDIO_FOCUS_CHECKBOX) | - (1ULL << WIDX_TITLE_MUSIC) | - (1ULL << WIDX_TITLE_MUSIC_DROPDOWN), - - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_SCREEN_EDGE_SCROLLING) | - (1ULL << WIDX_TRAP_CURSOR) | - (1ULL << WIDX_INVERT_DRAG) | - (1ULL << WIDX_ZOOM_TO_CURSOR) | - (1ULL << WIDX_HOTKEY_DROPDOWN) | - (1ULL << WIDX_TOOLBAR_SHOW_FINANCES) | - (1ULL << WIDX_TOOLBAR_SHOW_RESEARCH) | - (1ULL << WIDX_TOOLBAR_SHOW_CHEATS) | - (1ULL << WIDX_TOOLBAR_SHOW_NEWS) | - (1ULL << WIDX_THEMES) | - (1ULL << WIDX_THEMES_DROPDOWN) | - (1ULL << WIDX_THEMES_BUTTON) | - (1ULL << WIDX_TOOLBAR_SHOW_MUTE) | - (1ULL << WIDX_TOOLBAR_SHOW_CHAT) | - (1ULL << WIDX_TOOLBAR_SHOW_ZOOM), - - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_REAL_NAME_CHECKBOX) | - (1ULL << WIDX_AUTO_STAFF_PLACEMENT) | - (1ULL << WIDX_TITLE_SEQUENCE) | - (1ULL << WIDX_TITLE_SEQUENCE_DROPDOWN) | - (1ULL << WIDX_TITLE_SEQUENCE_BUTTON) | - (1ULL << WIDX_TITLE_SEQUENCE_RANDOM) | - (1ULL << WIDX_SCENARIO_GROUPING) | - (1ULL << WIDX_SCENARIO_GROUPING_DROPDOWN) | - (1ULL << WIDX_SCENARIO_UNLOCKING) | - (1ULL << WIDX_ALLOW_EARLY_COMPLETION) | - (1ULL << WIDX_AUTO_OPEN_SHOPS) | - (1ULL << WIDX_DEFAULT_INSPECTION_INTERVAL) | - (1ULL << WIDX_DEFAULT_INSPECTION_INTERVAL_DROPDOWN), - - MAIN_OPTIONS_ENABLED_WIDGETS | - (1ULL << WIDX_DEBUGGING_TOOLS) | - (1ULL << WIDX_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM) | - (1ULL << WIDX_SAVE_PLUGIN_DATA_CHECKBOX) | - (1ULL << WIDX_STAY_CONNECTED_AFTER_DESYNC) | - (1ULL << WIDX_ALWAYS_NATIVE_LOADSAVE) | - (1ULL << WIDX_AUTOSAVE) | - (1ULL << WIDX_AUTOSAVE_DROPDOWN) | - (1ULL << WIDX_AUTOSAVE_AMOUNT) | - (1ULL << WIDX_AUTOSAVE_AMOUNT_UP) | - (1ULL << WIDX_AUTOSAVE_AMOUNT_DOWN) | - (1ULL << WIDX_PATH_TO_RCT1_TEXT) | - (1ULL << WIDX_PATH_TO_RCT1_BUTTON) | - (1ULL << WIDX_PATH_TO_RCT1_CLEAR), -}; -// clang-format on - class OptionsWindow final : public Window { public: void OnOpen() override { widgets = window_options_display_widgets; - enabled_widgets = window_options_page_enabled_widgets[WINDOW_OPTIONS_PAGE_DISPLAY]; page = WINDOW_OPTIONS_PAGE_DISPLAY; frame_no = 0; InitScrollWidgets(); @@ -745,7 +626,6 @@ private: auto hasFilePicker = OpenRCT2::GetContext()->GetUiContext()->HasFilePicker(); if (!hasFilePicker) { - enabled_widgets &= ~(1ULL << WIDX_ALWAYS_NATIVE_LOADSAVE); disabled_widgets |= (1ULL << WIDX_ALWAYS_NATIVE_LOADSAVE); widgets[WIDX_ALWAYS_NATIVE_LOADSAVE].type = WindowWidgetType::Empty; } @@ -1181,12 +1061,10 @@ private: if (!gConfigGeneral.render_weather_effects && !gConfigGeneral.render_weather_gloom) { SetCheckboxValue(WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, true); - enabled_widgets &= ~(1ULL << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX); disabled_widgets |= (1ULL << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX); } else { - enabled_widgets |= (1ULL << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX); disabled_widgets &= ~(1ULL << WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX); } } @@ -2182,7 +2060,6 @@ private: { page = p; frame_no = 0; - enabled_widgets = window_options_page_enabled_widgets[page]; pressed_widgets = 0; widgets = window_options_page_widgets[page]; diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 35df56cd33..1eb37b9f00 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -277,84 +277,6 @@ static rct_window_event_list *window_park_page_events[] = { &window_park_awards_events, }; -#pragma endregion - -#pragma region Enabled widgets - -static uint32_t window_park_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7) | - (1ULL << WIDX_OPEN_OR_CLOSE) | - (1ULL << WIDX_BUY_LAND_RIGHTS) | - (1ULL << WIDX_LOCATE) | - (1ULL << WIDX_RENAME) | - (1ULL << WIDX_CLOSE_LIGHT) | - (1ULL << WIDX_OPEN_LIGHT), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7) | - (1ULL << WIDX_INCREASE_PRICE) | - (1ULL << WIDX_DECREASE_PRICE), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7) | - (1ULL << WIDX_ENTER_NAME), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_TAB_4) | - (1ULL << WIDX_TAB_5) | - (1ULL << WIDX_TAB_6) | - (1ULL << WIDX_TAB_7), -}; - static uint32_t window_park_page_hold_down_widgets[] = { 0, 0, @@ -413,7 +335,6 @@ static rct_window* WindowParkOpen() w = WindowCreateAutoPos(230, 174 + 9, &window_park_entrance_events, WC_PARK_INFORMATION, WF_10); w->widgets = window_park_entrance_widgets; - w->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_ENTRANCE]; w->number = 0; w->page = WINDOW_PARK_PAGE_ENTRANCE; w->frame_no = 0; @@ -464,7 +385,6 @@ rct_window* WindowParkEntranceOpen() window->page = WINDOW_PARK_PAGE_ENTRANCE; window->Invalidate(); window->widgets = window_park_entrance_widgets; - window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_ENTRANCE]; window->event_handlers = &window_park_entrance_events; window->pressed_widgets = 0; WindowInitScrollWidgets(window); @@ -809,7 +729,6 @@ rct_window* WindowParkRatingOpen() window->page = WINDOW_PARK_PAGE_RATING; window->Invalidate(); window->widgets = window_park_rating_widgets; - window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_RATING]; window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_RATING]; window->event_handlers = &window_park_rating_events; WindowInitScrollWidgets(window); @@ -943,7 +862,6 @@ rct_window* WindowParkGuestsOpen() window->page = WINDOW_PARK_PAGE_GUESTS; window->Invalidate(); window->widgets = window_park_guests_widgets; - window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_GUESTS]; window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_GUESTS]; window->event_handlers = &window_park_guests_events; WindowInitScrollWidgets(window); @@ -1350,7 +1268,6 @@ rct_window* WindowParkObjectiveOpen() window->page = WINDOW_PARK_PAGE_OBJECTIVE; window->Invalidate(); window->widgets = window_park_objective_widgets; - window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_OBJECTIVE]; window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_OBJECTIVE]; window->event_handlers = &window_park_objective_events; WindowInitScrollWidgets(window); @@ -1541,7 +1458,6 @@ rct_window* WindowParkAwardsOpen() window->page = WINDOW_PARK_PAGE_AWARDS; window->Invalidate(); window->widgets = window_park_awards_widgets; - window->enabled_widgets = window_park_page_enabled_widgets[WINDOW_PARK_PAGE_AWARDS]; window->hold_down_widgets = window_park_page_hold_down_widgets[WINDOW_PARK_PAGE_AWARDS]; window->event_handlers = &window_park_awards_events; WindowInitScrollWidgets(window); @@ -1655,7 +1571,6 @@ static void WindowParkSetPage(rct_window* w, int32_t page) w->var_492 = 0; w->RemoveViewport(); - w->enabled_widgets = window_park_page_enabled_widgets[page]; w->hold_down_widgets = window_park_page_hold_down_widgets[page]; w->event_handlers = window_park_page_events[page]; w->widgets = window_park_page_widgets[page]; diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index fb0b703c3b..c4cb9b2888 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -126,26 +126,13 @@ static rct_window_event_list *window_player_page_events[] = { #pragma endregion -static void WindowPlayerSetPage(rct_window* w, int32_t page); -static void WindowPlayerDrawTabImages(rct_drawpixelinfo *dpi, rct_window *w); -static void WindowPlayerUpdateViewport(rct_window *w, bool scroll); -static void WindowPlayerUpdateTitle(rct_window* w); - -static uint32_t window_player_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_GROUP) | - (1ULL << WIDX_GROUP_DROPDOWN) | - (1ULL << WIDX_LOCATE) | - (1ULL << WIDX_KICK), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2), -}; // clang-format on +static void WindowPlayerSetPage(rct_window* w, int32_t page); +static void WindowPlayerDrawTabImages(rct_drawpixelinfo* dpi, rct_window* w); +static void WindowPlayerUpdateViewport(rct_window* w, bool scroll); +static void WindowPlayerUpdateTitle(rct_window* w); + rct_window* WindowPlayerOpen(uint8_t id) { rct_window* window; @@ -173,7 +160,6 @@ rct_window* WindowPlayerOpen(uint8_t id) window->Invalidate(); window->widgets = window_player_page_widgets[WINDOW_PLAYER_PAGE_OVERVIEW]; - window->enabled_widgets = window_player_page_enabled_widgets[WINDOW_PLAYER_PAGE_OVERVIEW]; window->hold_down_widgets = 0; window->event_handlers = window_player_page_events[WINDOW_PLAYER_PAGE_OVERVIEW]; window->pressed_widgets = 0; @@ -533,7 +519,6 @@ static void WindowPlayerSetPage(rct_window* w, int32_t page) w->no_list_items = 0; w->selected_list_item = -1; - w->enabled_widgets = window_player_page_enabled_widgets[page]; w->hold_down_widgets = 0; w->event_handlers = window_player_page_events[page]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index f7dea958c7..7519796346 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -52,7 +52,6 @@ public: void OnOpen() override { widgets = window_ride_refurbish_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_CANCEL) | (1ULL << WIDX_REFURBISH); WindowInitScrollWidgets(this); } diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 3c7af17b02..f8bb6c227a 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -139,31 +139,8 @@ static rct_window_event_list *window_research_page_events[] = { #pragma endregion -#pragma region Enabled widgets - -static uint32_t window_research_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_LAST_DEVELOPMENT_BUTTON), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_RESEARCH_FUNDING) | - (1ULL << WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON) | - (1ULL << WIDX_TRANSPORT_RIDES) | - (1ULL << WIDX_GENTLE_RIDES) | - (1ULL << WIDX_ROLLER_COASTERS) | - (1ULL << WIDX_THRILL_RIDES) | - (1ULL << WIDX_WATER_RIDES) | - (1ULL << WIDX_SHOPS_AND_STALLS) | - (1ULL << WIDX_SCENERY_AND_THEMING), -}; // clang-format on -#pragma endregion - const int32_t window_research_tab_animation_loops[] = { 16, 16, @@ -189,7 +166,6 @@ rct_window* WindowResearchOpen() { w = WindowCreateAutoPos(WW_FUNDING, WH_FUNDING, window_research_page_events[0], WC_RESEARCH, WF_10); w->widgets = window_research_page_widgets[0]; - w->enabled_widgets = window_research_page_enabled_widgets[0]; w->number = 0; w->page = 0; w->frame_no = 0; @@ -204,7 +180,6 @@ rct_window* WindowResearchOpen() w->Invalidate(); w->widgets = window_research_page_widgets[0]; - w->enabled_widgets = window_research_page_enabled_widgets[0]; w->hold_down_widgets = 0; w->event_handlers = window_research_page_events[0]; w->pressed_widgets = 0; @@ -589,7 +564,6 @@ static void WindowResearchSetPage(rct_window* w, int32_t page) w->frame_no = 0; w->RemoveViewport(); - w->enabled_widgets = window_research_page_enabled_widgets[page]; w->hold_down_widgets = 0; w->event_handlers = window_research_page_events[page]; w->widgets = window_research_page_widgets[page]; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index e21d77ff37..4b8c8d6afa 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -389,115 +389,6 @@ static rct_widget *window_ride_page_widgets[] = { window_ride_customer_widgets, }; -#define MAIN_RIDE_ENABLED_WIDGETS \ - (1ULL << WIDX_CLOSE) | \ - (1ULL << WIDX_TAB_1) | \ - (1ULL << WIDX_TAB_2) | \ - (1ULL << WIDX_TAB_3) | \ - (1ULL << WIDX_TAB_4) | \ - (1ULL << WIDX_TAB_5) | \ - (1ULL << WIDX_TAB_6) | \ - (1ULL << WIDX_TAB_7) | \ - (1ULL << WIDX_TAB_8) | \ - (1ULL << WIDX_TAB_9) | \ - (1ULL << WIDX_TAB_10) - -static constexpr const uint64_t window_ride_page_enabled_widgets[] = { - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_VIEW) | - (1ULL << WIDX_VIEW_DROPDOWN) | - (1ULL << WIDX_OPEN) | - (1ULL << WIDX_CONSTRUCTION) | - (1ULL << WIDX_RENAME) | - (1ULL << WIDX_LOCATE) | - (1ULL << WIDX_DEMOLISH) | - (1ULL << WIDX_CLOSE_LIGHT) | - (1ULL << WIDX_SIMULATE_LIGHT) | - (1ULL << WIDX_TEST_LIGHT) | - (1ULL << WIDX_OPEN_LIGHT) | - (1ULL << WIDX_RIDE_TYPE) | - (1ULL << WIDX_RIDE_TYPE_DROPDOWN), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_VEHICLE_TYPE) | - (1ULL << WIDX_VEHICLE_TYPE_DROPDOWN) | - (1ULL << WIDX_VEHICLE_TRAINS) | - (1ULL << WIDX_VEHICLE_TRAINS_INCREASE) | - (1ULL << WIDX_VEHICLE_TRAINS_DECREASE) | - (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN) | - (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) | - (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_MODE_TWEAK_INCREASE) | - (1ULL << WIDX_MODE_TWEAK_DECREASE) | - (1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) | - (1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) | - (1ULL << WIDX_LOAD_CHECKBOX) | - (1ULL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX) | - (1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) | - (1ULL << WIDX_MINIMUM_LENGTH_INCREASE) | - (1ULL << WIDX_MINIMUM_LENGTH_DECREASE) | - (1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX) | - (1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) | - (1ULL << WIDX_MAXIMUM_LENGTH_DECREASE) | - (1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX) | - (1ULL << WIDX_MODE) | - (1ULL << WIDX_MODE_DROPDOWN) | - (1ULL << WIDX_LOAD) | - (1ULL << WIDX_LOAD_DROPDOWN) | - (1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE) | - (1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_INSPECTION_INTERVAL) | - (1ULL << WIDX_INSPECTION_INTERVAL_DROPDOWN) | - (1ULL << WIDX_LOCATE_MECHANIC) | - (1ULL << WIDX_REFURBISH_RIDE) | - (1ULL << WIDX_FORCE_BREAKDOWN), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_TRACK_COLOUR_SCHEME_DROPDOWN) | - (1ULL << WIDX_TRACK_MAIN_COLOUR) | - (1ULL << WIDX_TRACK_ADDITIONAL_COLOUR) | - (1ULL << WIDX_TRACK_SUPPORT_COLOUR) | - (1ULL << WIDX_MAZE_STYLE) | - (1ULL << WIDX_MAZE_STYLE_DROPDOWN) | - (1ULL << WIDX_PAINT_INDIVIDUAL_AREA) | - (1ULL << WIDX_ENTRANCE_STYLE) | - (1ULL << WIDX_ENTRANCE_STYLE_DROPDOWN) | - (1ULL << WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN) | - (1ULL << WIDX_VEHICLE_COLOUR_INDEX) | - (1ULL << WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN) | - (1ULL << WIDX_VEHICLE_BODY_COLOR) | - (1ULL << WIDX_VEHICLE_TRIM_COLOUR) | - (1ULL << WIDX_VEHICLE_TERNARY_COLOUR), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_PLAY_MUSIC) | - (1ULL << WIDX_MUSIC) | - (1ULL << WIDX_MUSIC_DROPDOWN), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_SAVE_TRACK_DESIGN) | - (1ULL << WIDX_SELECT_NEARBY_SCENERY) | - (1ULL << WIDX_RESET_SELECTION) | - (1ULL << WIDX_SAVE_DESIGN) | - (1ULL << WIDX_CANCEL_DESIGN), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_GRAPH_VELOCITY) | - (1ULL << WIDX_GRAPH_ALTITUDE) | - (1ULL << WIDX_GRAPH_VERTICAL) | - (1ULL << WIDX_GRAPH_LATERAL), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_PRIMARY_PRICE) | - (1ULL << WIDX_PRIMARY_PRICE_INCREASE) | - (1ULL << WIDX_PRIMARY_PRICE_DECREASE) | - (1ULL << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK) | - (1ULL << WIDX_SECONDARY_PRICE) | - (1ULL << WIDX_SECONDARY_PRICE_INCREASE) | - (1ULL << WIDX_SECONDARY_PRICE_DECREASE) | - (1ULL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK), - MAIN_RIDE_ENABLED_WIDGETS | - (1ULL << WIDX_SHOW_GUESTS_THOUGHTS) | - (1ULL << WIDX_SHOW_GUESTS_ON_RIDE) | - (1ULL << WIDX_SHOW_GUESTS_QUEUING), -}; - static constexpr const uint64_t window_ride_page_hold_down_widgets[] = { 0, (1ULL << WIDX_VEHICLE_TRAINS_INCREASE) | @@ -1233,7 +1124,6 @@ static rct_window* WindowRideOpen(Ride* ride) w = WindowCreateAutoPos(316, 207, window_ride_page_events[0], WC_RIDE, WF_10 | WF_RESIZABLE); w->widgets = window_ride_page_widgets[WINDOW_RIDE_PAGE_MAIN]; - w->enabled_widgets = window_ride_page_enabled_widgets[WINDOW_RIDE_PAGE_MAIN]; w->hold_down_widgets = window_ride_page_hold_down_widgets[WINDOW_RIDE_PAGE_MAIN]; w->rideId = ride->id; @@ -1327,7 +1217,6 @@ static rct_window* WindowRideOpenStation(Ride* ride, StationIndex stationIndex) w->Invalidate(); w->widgets = window_ride_page_widgets[w->page]; - w->enabled_widgets = window_ride_page_enabled_widgets[w->page]; w->hold_down_widgets = window_ride_page_hold_down_widgets[w->page]; w->event_handlers = window_ride_page_events[w->page]; w->pressed_widgets = 0; @@ -1465,7 +1354,6 @@ rct_window* WindowRideOpenVehicle(Vehicle* vehicle) w->Invalidate(); w->widgets = window_ride_page_widgets[w->page]; - w->enabled_widgets = window_ride_page_enabled_widgets[w->page]; w->hold_down_widgets = window_ride_page_hold_down_widgets[w->page]; w->event_handlers = window_ride_page_events[w->page]; w->pressed_widgets = 0; @@ -1519,7 +1407,6 @@ static void WindowRideSetPage(rct_window* w, int32_t page) w->RemoveViewport(); - w->enabled_widgets = window_ride_page_enabled_widgets[page]; w->hold_down_widgets = window_ride_page_hold_down_widgets[page]; w->event_handlers = window_ride_page_events[page]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 5b4f87263a..009e072232 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -258,15 +258,6 @@ rct_window* WindowRideConstructionOpen() ScreenCoordsXY(0, 29), 166, 394, &window_ride_construction_events, WC_RIDE_CONSTRUCTION, WF_NO_AUTO_CLOSE); w->widgets = window_ride_construction_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_LEFT_CURVE_VERY_SMALL) | (1ULL << WIDX_LEFT_CURVE_SMALL) - | (1ULL << WIDX_LEFT_CURVE) | (1ULL << WIDX_STRAIGHT) | (1ULL << WIDX_RIGHT_CURVE) | (1ULL << WIDX_RIGHT_CURVE_SMALL) - | (1ULL << WIDX_RIGHT_CURVE_VERY_SMALL) | (1ULL << WIDX_SPECIAL_TRACK_DROPDOWN) | (1ULL << WIDX_SLOPE_DOWN_STEEP) - | (1ULL << WIDX_SLOPE_DOWN) | (1ULL << WIDX_LEVEL) | (1ULL << WIDX_SLOPE_UP) | (1ULL << WIDX_SLOPE_UP_STEEP) - | (1ULL << WIDX_CHAIN_LIFT) | (1ULL << WIDX_BANK_LEFT) | (1ULL << WIDX_BANK_STRAIGHT) | (1ULL << WIDX_BANK_RIGHT) - | (1ULL << WIDX_CONSTRUCT) | (1ULL << WIDX_DEMOLISH) | (1ULL << WIDX_LEFT_CURVE_LARGE) | (1ULL << WIDX_PREVIOUS_SECTION) - | (1ULL << WIDX_NEXT_SECTION) | (1ULL << WIDX_SIMULATE) | (1ULL << WIDX_ENTRANCE) | (1ULL << WIDX_EXIT) - | (1ULL << WIDX_RIGHT_CURVE_LARGE) | (1ULL << WIDX_ROTATE) | (1ULL << WIDX_U_TRACK) | (1ULL << WIDX_O_TRACK) - | (1ULL << WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP) | (1ULL << WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN); WindowInitScrollWidgets(w); @@ -418,11 +409,6 @@ static void WindowRideConstructionMouseup(rct_window* w, rct_widgetindex widgetI static void WindowRideConstructionResize(rct_window* w) { WindowRideConstructionUpdateEnabledTrackPieces(); - w->enabled_widgets &= ~(1ULL << WIDX_CONSTRUCT); - if (_rideConstructionState != RideConstructionState::Place) - { - w->enabled_widgets |= (1ULL << WIDX_CONSTRUCT); - } auto ride = get_ride(_currentRideIndex); if (ride == nullptr) diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index a70e8ce9de..7c2351e617 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -155,13 +155,6 @@ public: void OnOpen() override { widgets = window_ride_list_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_OPEN_CLOSE_ALL) | (1ULL << WIDX_CURRENT_INFORMATION_TYPE) - | (1ULL << WIDX_INFORMATION_TYPE_DROPDOWN) | (1ULL << WIDX_SORT) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) - | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_CLOSE_LIGHT) | (1ULL << WIDX_OPEN_LIGHT); - if (network_get_mode() != NETWORK_MODE_CLIENT) - { - enabled_widgets |= (1ULL << WIDX_QUICK_DEMOLISH); - } WindowInitScrollWidgets(this); page = PAGE_RIDES; selected_list_item = -1; diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 82ed945d52..36d85e1158 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -91,7 +91,6 @@ rct_window* WindowSavePromptOpen() rct_window* window; PromptMode prompt_mode; rct_widget* widgets; - uint64_t enabled_widgets; prompt_mode = gSavePromptMode; if (prompt_mode == PromptMode::Quit) @@ -129,14 +128,12 @@ rct_window* WindowSavePromptOpen() if (gScreenFlags & (SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)) { widgets = window_quit_prompt_widgets; - enabled_widgets = (1 << WQIDX_CLOSE) | (1 << WQIDX_OK) | (1 << WQIDX_CANCEL); width = WW_QUIT; height = WH_QUIT; } else { widgets = window_save_prompt_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_SAVE) | (1ULL << WIDX_DONT_SAVE) | (1ULL << WIDX_CANCEL); width = WW_SAVE; height = WH_SAVE; } @@ -149,7 +146,6 @@ rct_window* WindowSavePromptOpen() window = WindowCreateCentred(width, height, &window_save_prompt_events, WC_SAVE_PROMPT, WF_TRANSPARENT | WF_STICK_TO_FRONT); window->widgets = widgets; - window->enabled_widgets = enabled_widgets; WindowInitScrollWidgets(window); // Pause the game if not network play. diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index 1263d793ee..a64b8829ad 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -190,8 +190,6 @@ rct_window* WindowScenarioselectOpen(std::function callb windowWidth, windowHeight, &window_scenarioselect_events, WC_SCENARIO_SELECT, WF_10 | (titleEditor ? WF_STICK_TO_FRONT : 0)); window->widgets = window_scenarioselect_widgets; - window->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB1) | (1ULL << WIDX_TAB2) | (1ULL << WIDX_TAB3) - | (1ULL << WIDX_TAB4) | (1ULL << WIDX_TAB5) | (1ULL << WIDX_TAB6) | (1ULL << WIDX_TAB7) | (1ULL << WIDX_TAB8); WindowScenarioselectInitTabs(window); InitialiseListItems(window); diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 31e86d7881..2488a3ebb6 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -275,15 +275,6 @@ static void WindowSceneryPrepareWidgets(rct_window* w) _widgets.push_back(lastWidget); w->widgets = _widgets.data(); - - w->enabled_widgets = (1ULL << WIDX_SCENERY_CLOSE) | (1ULL << WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) - | (1ULL << WIDX_SCENERY_PRIMARY_COLOUR_BUTTON) | (1ULL << WIDX_SCENERY_SECONDARY_COLOUR_BUTTON) - | (1ULL << WIDX_SCENERY_REPAINT_SCENERY_BUTTON) | (1ULL << WIDX_SCENERY_TERTIARY_COLOUR_BUTTON) - | (1ULL << WIDX_SCENERY_EYEDROPPER_BUTTON) | (1ULL << WIDX_SCENERY_BUILD_CLUSTER_BUTTON); - for (size_t i = 0; i < _tabEntries.size(); i++) - { - w->enabled_widgets |= (1ULL << (WIDX_SCENERY_TAB_1 + i)); - } } /** diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index a8eb994e1a..e9b2ffad08 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -58,8 +58,6 @@ public: void OnOpen() override { widgets = window_scenery_scatter_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_DECREMENT) | (1ULL << WIDX_PREVIEW) - | (1ULL << WIDX_DENSITY_LOW) | (1ULL << WIDX_DENSITY_MEDIUM) | (1ULL << WIDX_DENSITY_HIGH); hold_down_widgets = (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_DECREMENT); WindowInitScrollWidgets(this); window_push_others_below(this); diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 3ea3dba479..3d2619de39 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -129,9 +129,6 @@ rct_window* WindowServerListOpen() window_server_list_widgets[WIDX_PLAYER_NAME_INPUT].string = _playerName; window->widgets = window_server_list_widgets; - window->enabled_widgets - = ((1ULL << WIDX_CLOSE) | (1ULL << WIDX_PLAYER_NAME_INPUT) | (1ULL << WIDX_FETCH_SERVERS) | (1ULL << WIDX_ADD_SERVER) - | (1ULL << WIDX_START_SERVER)); WindowInitScrollWidgets(window); window->no_list_items = 0; window->selected_list_item = -1; diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index eab6c6d3a8..c1765171e5 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -100,11 +100,6 @@ rct_window* WindowServerStartOpen() window_server_start_widgets[WIDX_GREETING_INPUT].string = _greeting; window_server_start_widgets[WIDX_PASSWORD_INPUT].string = _password; window->widgets = window_server_start_widgets; - window->enabled_widgets - = ((1ULL << WIDX_CLOSE) | (1ULL << WIDX_PORT_INPUT) | (1ULL << WIDX_NAME_INPUT) | (1ULL << WIDX_DESCRIPTION_INPUT) - | (1ULL << WIDX_GREETING_INPUT) | (1ULL << WIDX_PASSWORD_INPUT) | (1ULL << WIDX_MAXPLAYERS) - | (1ULL << WIDX_MAXPLAYERS_INCREASE) | (1ULL << WIDX_MAXPLAYERS_DECREASE) | (1ULL << WIDX_ADVERTISE_CHECKBOX) - | (1ULL << WIDX_START_SERVER) | (1ULL << WIDX_LOAD_SERVER)); WindowInitScrollWidgets(window); window->no_list_items = 0; window->selected_list_item = -1; diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index fcb84d01dc..1ab1953552 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -95,7 +95,6 @@ public: void OnOpen() override { widgets = window_shortcut_change_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_REMOVE); WindowInitScrollWidgets(this); } @@ -421,8 +420,6 @@ private: void InitialiseWidgets() { - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_RESET); - _widgets.clear(); _widgets.insert(_widgets.begin(), std::begin(window_shortcut_widgets), std::end(window_shortcut_widgets) - 1); @@ -432,8 +429,6 @@ private: auto tab = MakeTab({ x, 17 }, STR_NONE); _widgets.push_back(tab); x += 31; - - enabled_widgets |= (1ULL << (WIDX_TAB_0 + i)); } _widgets.push_back(WIDGETS_END); diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 1554c83416..158364542a 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -78,9 +78,6 @@ public: void OnOpen() override { widgets = window_sign_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_SIGN_TEXT) | (1ULL << WIDX_SIGN_DEMOLISH) - | (1ULL << WIDX_MAIN_COLOUR) | (1ULL << WIDX_TEXT_COLOUR); - WindowInitScrollWidgets(this); } diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index b4d4e40c23..0b0a77e31d 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -206,35 +206,6 @@ static rct_window_event_list* window_staff_page_events[] = { &window_staff_stats_events, }; -// clang-format off -static constexpr const uint32_t window_staff_page_enabled_widgets[] = { - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_PICKUP) | - (1ULL << WIDX_PATROL) | - (1ULL << WIDX_RENAME) | - (1ULL << WIDX_LOCATE) | - (1ULL << WIDX_FIRE), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) | - (1ULL << WIDX_CHECKBOX_1) | - (1ULL << WIDX_CHECKBOX_2) | - (1ULL << WIDX_CHECKBOX_3) | - (1ULL << WIDX_CHECKBOX_4) | - (1ULL << WIDX_COSTUME_BTN), - - (1ULL << WIDX_CLOSE) | - (1ULL << WIDX_TAB_1) | - (1ULL << WIDX_TAB_2) | - (1ULL << WIDX_TAB_3) -}; -// clang-format on - static EntertainerCostume _availableCostumes[static_cast(EntertainerCostume::Count)]; enum class PatrolAreaValue @@ -284,7 +255,6 @@ rct_window* WindowStaffOpen(Peep* peep) w->Invalidate(); w->widgets = window_staff_overview_widgets; - w->enabled_widgets = window_staff_page_enabled_widgets[0]; w->hold_down_widgets = 0; w->event_handlers = window_staff_page_events[0]; w->pressed_widgets = 0; @@ -371,7 +341,6 @@ void WindowStaffSetPage(rct_window* w, int32_t page) w->RemoveViewport(); - w->enabled_widgets = window_staff_page_enabled_widgets[page]; w->hold_down_widgets = 0; w->event_handlers = window_staff_page_events[page]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index 333b7362da..bb606f3888 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -64,7 +64,6 @@ rct_window* WindowStaffFirePromptOpen(Peep* peep) w = WindowCreateCentred(WW, WH, &window_staff_fire_events, WC_FIRE_PROMPT, WF_TRANSPARENT); w->widgets = window_staff_fire_widgets; - w->enabled_widgets |= (1ULL << WIDX_CLOSE) | (1ULL << WIDX_YES) | (1ULL << WIDX_CANCEL); WindowInitScrollWidgets(w); diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 3055659b95..d344de3a1b 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -103,11 +103,6 @@ public: void OnOpen() override { widgets = window_staff_list_widgets; - enabled_widgets = (1ULL << WIDX_STAFF_LIST_CLOSE) | (1ULL << WIDX_STAFF_LIST_HANDYMEN_TAB) - | (1ULL << WIDX_STAFF_LIST_MECHANICS_TAB) | (1ULL << WIDX_STAFF_LIST_SECURITY_TAB) - | (1ULL << WIDX_STAFF_LIST_ENTERTAINERS_TAB) | (1ULL << WIDX_STAFF_LIST_HIRE_BUTTON) - | (1ULL << WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER) | (1ULL << WIDX_STAFF_LIST_SHOW_PATROL_AREA_BUTTON) - | (1ULL << WIDX_STAFF_LIST_MAP) | (1ULL << WIDX_STAFF_LIST_QUICK_FIRE); WindowInitScrollWidgets(this); widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WindowWidgetType::Empty; diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 9b6c1c88cd..2292969498 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -60,7 +60,6 @@ private: public: void OnOpen() override { - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_CANCEL) | (1ULL << WIDX_OKAY); widgets = window_text_input_widgets; WindowInitScrollWidgets(this); SetParentWindow(nullptr, 0); diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index d06923cafd..3804d89cee 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -324,14 +324,6 @@ rct_window* WindowThemesOpen() window = WindowCreateAutoPos(320, 107, &window_themes_events, WC_THEMES, WF_10 | WF_RESIZABLE); window->widgets = window_themes_widgets; - window->enabled_widgets = (1ULL << WIDX_THEMES_CLOSE) | (1ULL << WIDX_THEMES_SETTINGS_TAB) - | (1ULL << WIDX_THEMES_MAIN_UI_TAB) | (1ULL << WIDX_THEMES_PARK_TAB) | (1ULL << WIDX_THEMES_TOOLS_TAB) - | (1ULL << WIDX_THEMES_RIDE_PEEPS_TAB) | (1ULL << WIDX_THEMES_EDITORS_TAB) | (1ULL << WIDX_THEMES_MISC_TAB) - | (1ULL << WIDX_THEMES_PROMPTS_TAB) | (1ULL << WIDX_THEMES_FEATURES_TAB) | (1ULL << WIDX_THEMES_COLOURBTN_MASK) - | (1ULL << WIDX_THEMES_PRESETS) | (1ULL << WIDX_THEMES_PRESETS_DROPDOWN) | (1ULL << WIDX_THEMES_DUPLICATE_BUTTON) - | (1ULL << WIDX_THEMES_DELETE_BUTTON) | (1ULL << WIDX_THEMES_RENAME_BUTTON) | (1ULL << WIDX_THEMES_RCT1_RIDE_LIGHTS) - | (1ULL << WIDX_THEMES_RCT1_PARK_LIGHTS) | (1ULL << WIDX_THEMES_RCT1_SCENARIO_FONT) - | (1ULL << WIDX_THEMES_RCT1_BOTTOM_TOOLBAR); WindowThemesInitVars(); diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 79a86784c6..a9bd4ba67e 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -484,17 +484,6 @@ static rct_window_event_list TileInspectorWindowEvents([](auto& events) { }); // clang-format off -static uint64_t PageEnabledWidgets[] = { - (1ULL << WIDX_CLOSE), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_SURFACE_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_SURFACE_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_SURFACE_BUTTON_REMOVE_FENCES) | (1ULL << WIDX_SURFACE_BUTTON_RESTORE_FENCES) | (1ULL << WIDX_SURFACE_CHECK_CORNER_N) | (1ULL << WIDX_SURFACE_CHECK_CORNER_E) | (1ULL << WIDX_SURFACE_CHECK_CORNER_S) | (1ULL << WIDX_SURFACE_CHECK_CORNER_W) | (1ULL << WIDX_SURFACE_CHECK_DIAGONAL), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_PATH_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_PATH_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_PATH_CHECK_SLOPED) | (1ULL << WIDX_PATH_CHECK_BROKEN) | (1ULL << WIDX_PATH_CHECK_EDGE_N) | (1ULL << WIDX_PATH_CHECK_EDGE_NE) | (1ULL << WIDX_PATH_CHECK_EDGE_E) | (1ULL << WIDX_PATH_CHECK_EDGE_SE) | (1ULL << WIDX_PATH_CHECK_EDGE_S) | (1ULL << WIDX_PATH_CHECK_EDGE_SW) | (1ULL << WIDX_PATH_CHECK_EDGE_W) | (1ULL << WIDX_PATH_CHECK_EDGE_NW), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_TRACK_CHECK_APPLY_TO_ALL) | (1ULL << WIDX_TRACK_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_TRACK_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_TRACK_CHECK_CHAIN_LIFT) | (1ULL << WIDX_TRACK_CHECK_BLOCK_BRAKE_CLOSED) | (1ULL << WIDX_TRACK_CHECK_IS_INDESTRUCTIBLE), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_SCENERY_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_SCENERY_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_SCENERY_CHECK_QUARTER_N) | (1ULL << WIDX_SCENERY_CHECK_QUARTER_E) | (1ULL << WIDX_SCENERY_CHECK_QUARTER_S) | (1ULL << WIDX_SCENERY_CHECK_QUARTER_W) | (1ULL << WIDX_SCENERY_CHECK_COLLISION_N) | (1ULL << WIDX_SCENERY_CHECK_COLLISION_E) | (1ULL << WIDX_SCENERY_CHECK_COLLISION_S) | (1ULL << WIDX_SCENERY_CHECK_COLLISION_W), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_ENTRANCE_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_ENTRANCE_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_ENTRANCE_BUTTON_MAKE_USABLE), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_WALL_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_WALL_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_WALL_DROPDOWN_SLOPE) | (1ULL << WIDX_WALL_DROPDOWN_SLOPE_BUTTON) | (1ULL << WIDX_WALL_SPINNER_ANIMATION_FRAME_INCREASE) | (1ULL << WIDX_WALL_SPINNER_ANIMATION_FRAME_DECREASE), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_LARGE_SCENERY_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_LARGE_SCENERY_SPINNER_HEIGHT_DECREASE), - (1ULL << WIDX_CLOSE) | (1ULL << WIDX_BUTTON_REMOVE) | (1ULL << WIDX_BUTTON_ROTATE) | (1ULL << WIDX_BUTTON_COPY) | (1ULL << WIDX_BANNER_SPINNER_HEIGHT_INCREASE) | (1ULL << WIDX_BANNER_SPINNER_HEIGHT_DECREASE) | (1ULL << WIDX_BANNER_CHECK_BLOCK_NE) | (1ULL << WIDX_BANNER_CHECK_BLOCK_SE) | (1ULL << WIDX_BANNER_CHECK_BLOCK_SW) | (1ULL << WIDX_BANNER_CHECK_BLOCK_NW), -}; static uint64_t PageHoldDownWidgets[] = { (1ULL << WIDX_SPINNER_X_INCREASE) | (1ULL << WIDX_SPINNER_X_DECREASE) | (1ULL << WIDX_SPINNER_Y_INCREASE) | (1ULL << WIDX_SPINNER_Y_DECREASE), @@ -1336,7 +1325,6 @@ static void WindowTileInspectorSetPage(rct_window* w, const TileInspectorPage pa w->tileInspectorPage = page; auto pageIndex = EnumValue(page); w->widgets = PageWidgets[pageIndex]; - w->enabled_widgets = PageEnabledWidgets[pageIndex]; w->hold_down_widgets = PageHoldDownWidgets[pageIndex]; w->disabled_widgets = PageDisabledWidgets[pageIndex]; w->pressed_widgets = 0; diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index b5d5f47884..7c5f06b251 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -221,10 +221,6 @@ void WindowTitleCommandEditorOpen(TitleSequence* sequence, int32_t index, bool i window_title_command_editor_widgets[WIDX_TEXTBOX_X].string = textbox1Buffer; window_title_command_editor_widgets[WIDX_TEXTBOX_Y].string = textbox2Buffer; window->widgets = window_title_command_editor_widgets; - window->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_COMMAND) | (1ULL << WIDX_COMMAND_DROPDOWN) - | (1ULL << WIDX_TEXTBOX_FULL) | (1ULL << WIDX_TEXTBOX_X) | (1ULL << WIDX_TEXTBOX_Y) | (1ULL << WIDX_INPUT) - | (1ULL << WIDX_INPUT_DROPDOWN) | (1ULL << WIDX_GET) | (1ULL << WIDX_SELECT_SCENARIO) | (1ULL << WIDX_SELECT_SPRITE) - | (1ULL << WIDX_OKAY) | (1ULL << WIDX_CANCEL); WindowInitScrollWidgets(window); rct_widget* const viewportWidget = &window_title_command_editor_widgets[WIDX_VIEWPORT]; diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 4b91bf95dc..af5189a7c3 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -216,22 +216,6 @@ void WindowTitleEditorOpen(int32_t tab) window = WindowCreateAutoPos(WW, WH2, &window_title_editor_events, WC_TITLE_EDITOR, WF_10 | WF_RESIZABLE); window->widgets = window_title_editor_widgets; - window->enabled_widgets = (1ULL << WIDX_TITLE_EDITOR_CLOSE) | (1ULL << WIDX_TITLE_EDITOR_PRESETS_TAB) - | (1ULL << WIDX_TITLE_EDITOR_SAVES_TAB) | (1ULL << WIDX_TITLE_EDITOR_SCRIPT_TAB) | - - (1ULL << WIDX_TITLE_EDITOR_PRESETS) | (1ULL << WIDX_TITLE_EDITOR_PRESETS_DROPDOWN) - | (1ULL << WIDX_TITLE_EDITOR_NEW_BUTTON) | (1ULL << WIDX_TITLE_EDITOR_DUPLICATE_BUTTON) - | (1ULL << WIDX_TITLE_EDITOR_DELETE_BUTTON) | (1ULL << WIDX_TITLE_EDITOR_RENAME_BUTTON) | - - (1ULL << WIDX_TITLE_EDITOR_ADD_SAVE) | (1ULL << WIDX_TITLE_EDITOR_REMOVE_SAVE) | (1ULL << WIDX_TITLE_EDITOR_RENAME_SAVE) - | (1ULL << WIDX_TITLE_EDITOR_LOAD_SAVE) | - - (1ULL << WIDX_TITLE_EDITOR_INSERT) | (1ULL << WIDX_TITLE_EDITOR_EDIT) | (1ULL << WIDX_TITLE_EDITOR_DELETE) | - //(1ULL << WIDX_TITLE_EDITOR_RELOAD) | - (1ULL << WIDX_TITLE_EDITOR_SKIP_TO) | (1ULL << WIDX_TITLE_EDITOR_MOVE_DOWN) | (1ULL << WIDX_TITLE_EDITOR_MOVE_UP) | - - (1ULL << WIDX_TITLE_EDITOR_PLAY) | (1ULL << WIDX_TITLE_EDITOR_STOP) | (1ULL << WIDX_TITLE_EDITOR_REPLAY) - | (1ULL << WIDX_TITLE_EDITOR_SKIP); WindowInitScrollWidgets(window); window->list_information_type = 0; diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 74b4da4811..7b6192f0ad 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -47,7 +47,6 @@ rct_window* WindowTitleExitOpen() ScreenCoordsXY(context_get_width() - 40, context_get_height() - 64), 40, 64, &window_title_exit_events, WC_TITLE_EXIT, WF_STICK_TO_BACK | WF_TRANSPARENT); window->widgets = window_title_exit_widgets; - window->enabled_widgets |= (1ULL << WIDX_EXIT); WindowInitScrollWidgets(window); return window; diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index 20bbadf540..d79c1e55f3 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -51,7 +51,6 @@ rct_window* WindowTitleLogoOpen() window->colours[0] = TRANSLUCENT(COLOUR_GREY); window->colours[1] = TRANSLUCENT(COLOUR_GREY); window->colours[2] = TRANSLUCENT(COLOUR_GREY); - window->enabled_widgets = (1ULL << WIDX_LOGO); return window; } diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index eccfa9de44..8adcdfa70e 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -76,28 +76,22 @@ rct_window* WindowTitleMenuOpen() WF_STICK_TO_BACK | WF_TRANSPARENT | WF_NO_BACKGROUND); window->widgets = window_title_menu_widgets; - window->enabled_widgets - = ((1ULL << WIDX_START_NEW_GAME) | (1ULL << WIDX_CONTINUE_SAVED_GAME) | -#ifndef DISABLE_NETWORK - (1ULL << WIDX_MULTIPLAYER) | + +#ifdef DISABLE_NETWORK + window->widgets[WIDX_MULTIPLAYER].type = WindowWidgetType::Empty; #endif - (1ULL << WIDX_GAME_TOOLS)); rct_widgetindex i = 0; int32_t x = 0; for (rct_widget* widget = window->widgets; widget != &window->widgets[WIDX_NEW_VERSION]; widget++) { - if (WidgetIsEnabled(window, i)) + if (widget->type != WindowWidgetType::Empty) { widget->left = x; widget->right = x + MenuButtonDims.width - 1; x += MenuButtonDims.width; } - else - { - widget->type = WindowWidgetType::Empty; - } i++; } window->width = x; @@ -225,7 +219,6 @@ static void WindowTitleMenuInvalidate(rct_window* w) w->windowPos.y + MenuButtonDims.height + UpdateButtonDims.height - 1 }; if (OpenRCT2::GetContext()->HasNewVersionInfo()) { - w->enabled_widgets |= (1ULL << WIDX_NEW_VERSION); w->widgets[WIDX_NEW_VERSION].type = WindowWidgetType::Button; _filterRect.Point1.y = w->windowPos.y; } diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index 19ecc66ff4..e2d19ec69d 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -43,7 +43,6 @@ rct_window* WindowTitleOptionsOpen() ScreenCoordsXY(context_get_width() - 80, 0), 80, 15, &window_title_options_events, WC_TITLE_OPTIONS, WF_STICK_TO_BACK | WF_TRANSPARENT); window->widgets = window_title_options_widgets; - window->enabled_widgets |= (1ULL << WIDX_OPTIONS); WindowInitScrollWidgets(window); return window; diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 68b4e44a39..1ca85b8312 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -777,7 +777,6 @@ static void WindowTopToolbarInvalidate(rct_window* w) for (int i = WIDX_PAUSE; i <= WIDX_CHAT; i++) if (window_top_toolbar_widgets[i].type != WindowWidgetType::Empty) enabledWidgets |= (1 << i); - w->enabled_widgets = enabledWidgets; // Align left hand side toolbar buttons firstAlignment = 1; diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 026ed23300..1e0890085b 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -98,7 +98,6 @@ rct_window* WindowTrackManageOpen(track_design_file_ref* tdFileRef) rct_window* w = WindowCreateCentred( WW, WH, &window_track_manage_events, WC_MANAGE_TRACK_DESIGN, WF_STICK_TO_FRONT | WF_TRANSPARENT); w->widgets = window_track_manage_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_RENAME) | (1ULL << WIDX_DELETE); WindowInitScrollWidgets(w); rct_window* trackDesignListWindow = window_find_by_class(WC_TRACK_DESIGN_LIST); @@ -208,7 +207,6 @@ static void WindowTrackDeletePromptOpen() std::max(TOP_TOOLBAR_HEIGHT + 1, (screenWidth - WW_DELETE_PROMPT) / 2), (screenHeight - WH_DELETE_PROMPT) / 2), WW_DELETE_PROMPT, WH_DELETE_PROMPT, &window_track_delete_prompt_events, WC_TRACK_DELETE_PROMPT, WF_STICK_TO_FRONT); w->widgets = window_track_delete_prompt_widgets; - w->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_RENAME) | (1ULL << WIDX_DELETE); WindowInitScrollWidgets(w); w->flags |= WF_TRANSPARENT; } diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 1ec0ebf457..406e38df16 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -145,7 +145,6 @@ rct_window* WindowTrackPlaceOpen(const track_design_file_ref* tdFileRef) rct_window* w = WindowCreate(ScreenCoordsXY(0, 29), 200, 124, &window_track_place_events, WC_TRACK_DESIGN_PLACE, 0); w->widgets = window_track_place_widgets; - w->enabled_widgets = 1ULL << WIDX_CLOSE | 1ULL << WIDX_ROTATE | 1ULL << WIDX_MIRROR | 1ULL << WIDX_SELECT_DIFFERENT_DESIGN; WindowInitScrollWidgets(w); tool_set(w, WIDX_PRICE, Tool::Crosshair); input_set_flag(INPUT_FLAG_6, true); diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 249ae72539..646447987c 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -203,17 +203,13 @@ public: String::Set(_filterString, sizeof(_filterString), ""); window_track_list_widgets[WIDX_FILTER_STRING].string = _filterString; widgets = window_track_list_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_FILTER_STRING) | (1ULL << WIDX_FILTER_CLEAR) - | (1ULL << WIDX_ROTATE) | (1ULL << WIDX_TOGGLE_SCENERY); if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) { - enabled_widgets &= ~(1ULL << WIDX_BACK); widgets[WIDX_BACK].type = WindowWidgetType::Empty; } else { - enabled_widgets |= (1ULL << WIDX_BACK); widgets[WIDX_BACK].type = WindowWidgetType::TableHeader; } diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 7521e67050..038e2c5e36 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -344,9 +344,6 @@ public: void OnOpen() override { this->widgets = window_view_clipping_widgets; - this->enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_CLIP_CHECKBOX_ENABLE) | (1ULL << WIDX_CLIP_HEIGHT_VALUE) - | (1ULL << WIDX_CLIP_HEIGHT_INCREASE) | (1ULL << WIDX_CLIP_HEIGHT_DECREASE) | (1ULL << WIDX_CLIP_HEIGHT_SLIDER) - | (1ULL << WIDX_CLIP_SELECTOR) | (1ULL << WIDX_CLIP_CLEAR); this->hold_down_widgets = (1ULL << WIDX_CLIP_HEIGHT_INCREASE) | (1UL << WIDX_CLIP_HEIGHT_DECREASE); WindowInitScrollWidgets(this); diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index aff8f38c99..5e20d060fd 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -74,7 +74,6 @@ public: GetFreeViewportNumber(); widgets = window_viewport_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_ZOOM_IN) | (1ULL << WIDX_ZOOM_OUT) | (1ULL << WIDX_LOCATE); // Create viewport viewport_create(this, windowPos, width, height, Focus(TileCoordsXYZ(128, 128, 0).ToCoordsXYZ())); diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 2e44936217..1261fc42d6 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -46,7 +46,6 @@ public: void OnOpen() override { widgets = window_water_widgets; - enabled_widgets = (1ULL << WIDX_CLOSE) | (1ULL << WIDX_DECREMENT) | (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_PREVIEW); hold_down_widgets = (1ULL << WIDX_INCREMENT) | (1ULL << WIDX_DECREMENT); WindowInitScrollWidgets(this); window_push_others_below(this); diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index da3500c912..848d9e59fc 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -126,7 +126,6 @@ constexpr rct_widget MakeSpinnerIncreaseWidget( void WidgetScrollUpdateThumbs(rct_window* w, rct_widgetindex widget_index); void WidgetDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); -bool WidgetIsEnabled(rct_window* w, rct_widgetindex widgetIndex); bool WidgetIsDisabled(rct_window* w, rct_widgetindex widgetIndex); bool WidgetIsHoldable(rct_window* w, rct_widgetindex widgetIndex); bool WidgetIsVisible(rct_window* w, rct_widgetindex widgetIndex); diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index f4c0049b4a..0c0df9a028 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -72,7 +72,6 @@ using WidgetFlags = uint32_t; namespace WIDGET_FLAGS { const WidgetFlags TEXT_IS_STRING = 1 << 0; - const WidgetFlags IS_ENABLED = 1 << 1; const WidgetFlags IS_PRESSED = 1 << 2; const WidgetFlags IS_DISABLED = 1 << 3; const WidgetFlags TOOLTIP_IS_STRING = 1 << 4; diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index 1e41e1b786..efbab2cccc 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -33,7 +33,6 @@ struct rct_window { rct_window_event_list* event_handlers{}; rct_viewport* viewport{}; - uint64_t enabled_widgets{}; uint64_t disabled_widgets{}; uint64_t pressed_widgets{}; uint64_t hold_down_widgets{};