mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Use consistent left-shift notation for widgets (#14956)

Browse Source
This commit is contained in:
Hielke Morsink
2021-06-26 14:23:15 +02:00
committed by GitHub
parent acd45e6f75
commit e54dc7e466
59 changed files with 654 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@@ -176,31 +176,31 @@ 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[] = {
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) |
(1 << WIDX_OBJECTIVE) |
(1 << WIDX_OBJECTIVE_DROPDOWN) |
(1 << WIDX_OBJECTIVE_ARG_1_INCREASE) |
(1 << WIDX_OBJECTIVE_ARG_1_DECREASE) |
(1 << WIDX_OBJECTIVE_ARG_2_INCREASE) |
(1 << WIDX_OBJECTIVE_ARG_2_DECREASE) |
(1 << WIDX_PARK_NAME) |
(1 << WIDX_SCENARIO_NAME) |
(1 << WIDX_CATEGORY) |
(1 << WIDX_CATEGORY_DROPDOWN) |
(1 << WIDX_DETAILS),
(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),
(1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2)
(1ULL << WIDX_CLOSE) |
(1ULL << WIDX_TAB_1) |
(1ULL << WIDX_TAB_2)
};
static uint64_t window_editor_objective_options_page_hold_down_widgets[] = {
(1 << WIDX_OBJECTIVE_ARG_1_INCREASE) |
(1 << WIDX_OBJECTIVE_ARG_1_DECREASE) |
(1 << WIDX_OBJECTIVE_ARG_2_INCREASE) |
(1 << WIDX_OBJECTIVE_ARG_2_DECREASE),
(1ULL << WIDX_OBJECTIVE_ARG_1_INCREASE) |
(1ULL << WIDX_OBJECTIVE_ARG_1_DECREASE) |
(1ULL << WIDX_OBJECTIVE_ARG_2_INCREASE) |
(1ULL << WIDX_OBJECTIVE_ARG_2_DECREASE),
0
};
@@ -270,7 +270,7 @@ static void window_editor_objective_options_draw_tab_images(rct_window* w, rct_d
gfx_draw_sprite(dpi, ImageId(spriteIndex), w->windowPos + ScreenCoordsXY{ widget->left, widget->top });
// Tab 2
if (!(w->disabled_widgets & (1 << WIDX_TAB_2)))
if (!(w->disabled_widgets & (1ULL << WIDX_TAB_2)))
{
widget = &w->widgets[WIDX_TAB_2];
spriteIndex = SPR_TAB_RIDE_0;
@@ -1125,10 +1125,10 @@ static void window_editor_objective_options_update_disabled_widgets(rct_window*
const auto& rideManager = GetRideManager();
if (std::any_of(rideManager.begin(), rideManager.end(), [](const Ride& ride) { return ride.IsRide(); }))
{
w->disabled_widgets &= ~(1 << WIDX_TAB_2);
w->disabled_widgets &= ~(1ULL << WIDX_TAB_2);
}
else
{
w->disabled_widgets |= (1 << WIDX_TAB_2);
w->disabled_widgets |= (1ULL << WIDX_TAB_2);
}
}