mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make WIDGETS_END constexpr

This commit is contained in:
Hielke Morsink 2021-09-26 11:11:42 +02:00 committed by GitHub
parent 2ba515fb37
commit 9dd9b27db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
74 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/scripting/CustomWindow.cpp
View File

@ -965,7 +965,7 @@ namespace OpenRCT2::Ui::Windows
}
}
widgetList.push_back({ WIDGETS_END });
widgetList.push_back(WIDGETS_END);
widgets = widgetList.data();
WindowInitScrollWidgets(this);

4
src/openrct2-ui/windows/About.cpp
View File

@ -70,12 +70,12 @@ static rct_widget window_about_openrct2_widgets[] = {
MakeWidget({168, 115 + 72}, {200, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_JOIN_DISCORD ), // "join discord" button
MakeWidget({10, 250}, {WW - 20, 50}, WindowWidgetType::LabelCentred, WindowColour::Secondary, STR_ABOUT_OPENRCT2_DESCRIPTION_2), // Contributors
MakeWidget({10, 300}, {WW - 20, 50}, WindowWidgetType::LabelCentred, WindowColour::Secondary, STR_ABOUT_OPENRCT2_DESCRIPTION_3), // Copyright
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_about_rct2_widgets[] = {
WIDGETS_MAIN,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_about_page_widgets[] = {

2
src/openrct2-ui/windows/Banner.cpp
View File

@ -66,7 +66,7 @@ static rct_widget window_banner_widgets[] = {
MakeWidget({ 5, WH - 16}, {12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // high money
MakeWidget({ 43, WH - 16}, {39, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ), // high money
MakeWidget({ 70, WH - 15}, {11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP ), // high money
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/Changelog.cpp
View File

@ -46,7 +46,7 @@ static rct_widget _windowChangelogWidgets[] = {
MakeWidget({0, 14}, {500, 382}, WindowWidgetType::Resize, WindowColour::Secondary ), // content panel
MakeWidget({3, 16}, {495, 366}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_BOTH ), // scroll area
MakeWidget({3, 473}, {300, 14}, WindowWidgetType::Placeholder, WindowColour::Secondary, STR_NEW_RELEASE_DOWNLOAD_PAGE), // changelog button
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

8
src/openrct2-ui/windows/Cheats.cpp
View File

@ -212,7 +212,7 @@ static rct_widget window_cheats_money_widgets[] =
MakeSpinnerWidgets({120, 239}, CHEAT_SPINNER, WindowWidgetType::Spinner, WindowColour::Secondary ), // Day box
MakeWidget ({ 11, 258}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::Secondary, STR_DATE_SET ), // Set Date
MakeWidget ({127, 258}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::Secondary, STR_DATE_RESET ), // Reset Date
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_cheats_guests_widgets[] =
@ -245,7 +245,7 @@ static rct_widget window_cheats_guests_widgets[] =
MakeWidget({127, 384}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::Secondary, STR_SHOP_ITEM_PLURAL_UMBRELLA ), // give guests umbrellas
MakeWidget({ 11, 426}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::Secondary, STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_LARGE_TRAM_GUESTS_TIP), // large tram
MakeWidget({127, 426}, CHEAT_BUTTON, WindowWidgetType::Button, WindowColour::Secondary, STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_REMOVE_ALL_GUESTS_TIP), // remove all guests
{ WIDGETS_END },
WIDGETS_END,
};
//Strings for following moved to window_cheats_paint()
@ -281,7 +281,7 @@ static rct_widget window_cheats_misc_widgets[] =
MakeWidget ({ 5, 347}, {238, 35}, WindowWidgetType::Groupbox, WindowColour::Secondary, STR_CHEAT_STAFF_GROUP ), // Staff group
MakeWidget ({126, 361}, {111, 14}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ), // Staff speed
MakeWidget ({225, 362}, { 11, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), // Staff speed
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_cheats_rides_widgets[] =
{
@ -307,7 +307,7 @@ static rct_widget window_cheats_rides_widgets[] =
MakeWidget({ 11, 384}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_CHEAT_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES ), // Show vehicles from other track types
MakeWidget({ 11, 405}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT_TIP ), // Disable train length limits
MakeWidget({ 11, 426}, CHEAT_CHECK, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_CHEAT_IGNORE_RESEARCH_STATUS, STR_CHEAT_IGNORE_RESEARCH_STATUS_TIP ), // Ignore Research Status
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_cheats_page_widgets[] =

2
src/openrct2-ui/windows/ClearScenery.cpp
View File

@ -41,7 +41,7 @@ static rct_widget window_clear_scenery_widgets[] = {
MakeRemapWidget({ 7, 53}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_BUTTON_TREES, STR_CLEAR_SCENERY_REMOVE_SMALL_SCENERY_TIP), // small scenery
MakeRemapWidget({37, 53}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_BUTTON_LARGE_SCENERY, STR_CLEAR_SCENERY_REMOVE_LARGE_SCENERY_TIP), // large scenery
MakeRemapWidget({67, 53}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_BUTTON_FOOTPATH, STR_CLEAR_SCENERY_REMOVE_FOOTPATHS_TIP), // footpaths
{ WIDGETS_END },
WIDGETS_END,
};
static void window_clear_scenery_close(rct_window *w);

2
src/openrct2-ui/windows/CustomCurrency.cpp
View File

@ -39,7 +39,7 @@ static rct_widget window_custom_currency_widgets[] = {
MakeWidget ({120, 50}, { 81, 11}, WindowWidgetType::Button, WindowColour::Secondary, STR_EMPTY ),
MakeWidget ({220, 50}, {131, 11}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ),
MakeWidget ({339, 51}, { 11, 9}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
{ WIDGETS_END },
WIDGETS_END,
};

2
src/openrct2-ui/windows/DebugPaint.cpp
View File

@ -42,7 +42,7 @@ static rct_widget window_debug_paint_widgets[] = {
MakeWidget({8, 8 + 15 * 2}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS),
MakeWidget({8, 8 + 15 * 3}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_BOUND_BOXES ),
MakeWidget({8, 8 + 15 * 4}, { 185, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS ),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_debug_paint_mouseup(rct_window * w, rct_widgetindex widgetIndex);

4
src/openrct2-ui/windows/DemolishRidePrompt.cpp
View File

@ -36,14 +36,14 @@ static rct_widget window_ride_demolish_widgets[] = {
WINDOW_SHIM_WHITE(STR_DEMOLISH_RIDE, WW, WH),
MakeWidget({ 10, WH - 22}, {85, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_DEMOLISH ),
MakeWidget({WW - 95, WH - 22}, {85, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_ride_refurbish_widgets[] = {
WINDOW_SHIM_WHITE(STR_REFURBISH_RIDE, WW, WH),
MakeWidget({ 10, WH - 22}, {85, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_REFURBISH ),
MakeWidget({WW - 95, WH - 22}, {85, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL),
{ WIDGETS_END }
WIDGETS_END,
};
static void window_ride_demolish_mouseup(rct_window *w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/Dropdown.cpp
View File

@ -33,7 +33,7 @@ enum
static rct_widget window_dropdown_widgets[] = {
MakeWidget({ 0, 0 }, { 1, 1 }, WindowWidgetType::ImgBtn, WindowColour::Primary),
{ WIDGETS_END },
WIDGETS_END,
};
static int32_t _dropdown_num_columns;

2
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -40,7 +40,7 @@ static rct_widget window_editor_bottom_toolbar_widgets[] = {
MakeWidget({ 2, 2}, {196, 30}, WindowWidgetType::FlatBtn, WindowColour::Primary),
MakeWidget({440, 0}, {200, 34}, WindowWidgetType::ImgBtn, WindowColour::Primary),
MakeWidget({442, 2}, {196, 30}, WindowWidgetType::FlatBtn, WindowColour::Primary),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_editor_bottom_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);

4
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -55,12 +55,12 @@ static rct_widget window_editor_inventions_list_widgets[] = {
MakeWidget({375, 343}, {220, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_MOVE_ALL_TOP ),
MakeWidget({375, 358}, {220, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_MOVE_ALL_BOTTOM ),
MakeWidget({375, 373}, {220, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_editor_inventions_list_drag_widgets[] = {
MakeWidget({0, 0}, {150, 14}, WindowWidgetType::ImgBtn, WindowColour::Primary),
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion

2
src/openrct2-ui/windows/EditorMain.cpp
View File

@ -24,7 +24,7 @@ static rct_window_event_list window_editor_main_events([](auto& events) {
static rct_widget window_editor_main_widgets[] = {
MakeWidget({ 0, 0 }, { 0, 0 }, WindowWidgetType::Viewport, WindowColour::Primary, STR_VIEWPORT),
{ WIDGETS_END },
WIDGETS_END,
};
/**

2
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -170,7 +170,7 @@ static std::vector<rct_widget> _window_editor_object_selection_widgets = {
MakeTab ({ 3, 17}, STR_STRING_DEFINED_TOOLTIP ),
// Copied object type times...
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion

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

@ -102,13 +102,13 @@ static rct_widget window_editor_objective_options_main_widgets[] = {
MakeWidget ({ 98, 133}, {180, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_NONE, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN),
MakeWidget ({266, 134}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN),
MakeWidget ({370, 150}, { 75, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_CHANGE, STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_editor_objective_options_rides_widgets[] = {
MAIN_OBJECTIVE_OPTIONS_WIDGETS,
MakeWidget({ 3, 60}, {374, 161}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget *window_editor_objective_options_widgets[] = {

6
src/openrct2-ui/windows/EditorScenarioOptions.cpp
View File

@ -129,7 +129,7 @@ static rct_widget window_editor_scenario_options_financial_widgets[] = {
MakeSpinnerWidgets({168, 99}, { 100, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets
MakeSpinnerWidgets({168, 116}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets
MakeWidget ({ 8, 133}, {WW_FINANCIAL - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP ),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_editor_scenario_options_guests_widgets[] = {
@ -144,7 +144,7 @@ static rct_widget window_editor_scenario_options_guests_widgets[] = {
MakeSpinnerWidgets({268, 99}, { 70, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets
MakeWidget ({ 8, 116}, {WW_GUESTS - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_GUESTS_PREFER_LESS_INTENSE_RIDES, STR_GUESTS_PREFER_LESS_INTENSE_RIDES_TIP),
MakeWidget ({ 8, 133}, {WW_GUESTS - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_GUESTS_PREFER_MORE_INTENSE_RIDES, STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_editor_scenario_options_park_widgets[] = {
@ -165,7 +165,7 @@ static rct_widget window_editor_scenario_options_park_widgets[] = {
MakeWidget ({ 8, 150}, {WW_PARK - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP ),
MakeWidget ({ 8, 167}, {WW_PARK - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_HARD_PARK_RATING, STR_HARD_PARK_RATING_TIP ),
MakeWidget ({ 8, 184}, {WW_PARK - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_HARD_GUEST_GENERATION, STR_HARD_GUEST_GENERATION_TIP ),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget *window_editor_scenario_options_widgets[] = {

2
src/openrct2-ui/windows/Error.cpp
View File

@ -24,7 +24,7 @@ enum {
static rct_widget window_error_widgets[] = {
MakeWidget({0, 0}, {200, 42}, WindowWidgetType::ImgBtn, WindowColour::Primary),
{ WIDGETS_END }
WIDGETS_END,
};
static void window_error_unknown5(rct_window *w);

12
src/openrct2-ui/windows/Finances.cpp
View File

@ -100,7 +100,7 @@ static rct_widget _windowFinancesSummaryWidgets[] =
TAB_WIDGETS,
MakeWidget ({130, 50}, {391, 211}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_HORIZONTAL ),
MakeSpinnerWidgets({ 64, 279}, { 97, 14}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_FINANCES_SUMMARY_LOAN_VALUE), // NB: 3 widgets.
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget _windowFinancesCashWidgets[] =
@ -108,7 +108,7 @@ static rct_widget _windowFinancesCashWidgets[] =
WINDOW_SHIM(STR_FINANCIAL_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS),
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WindowWidgetType::Resize, WindowColour::Secondary),
TAB_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget _windowFinancesParkValueWidgets[] =
@ -116,7 +116,7 @@ static rct_widget _windowFinancesParkValueWidgets[] =
WINDOW_SHIM(STR_PARK_VALUE_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS),
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WindowWidgetType::Resize, WindowColour::Secondary),
TAB_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget _windowFinancesProfitWidgets[] =
@ -124,7 +124,7 @@ static rct_widget _windowFinancesProfitWidgets[] =
WINDOW_SHIM(STR_PROFIT_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS),
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WindowWidgetType::Resize, WindowColour::Secondary),
TAB_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget _windowFinancesMarketingWidgets[] =
@ -140,7 +140,7 @@ static rct_widget _windowFinancesMarketingWidgets[] =
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget _windowFinancesResearchWidgets[] =
@ -159,7 +159,7 @@ static rct_widget _windowFinancesResearchWidgets[] =
MakeWidget({ 8, 160}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ),
MakeWidget({ 8, 173}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ),
MakeWidget({ 8, 186}, {WW_RESEARCH - 14, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *_windowFinancesPageWidgets[] =

2
src/openrct2-ui/windows/Footpath.cpp
View File

@ -106,7 +106,7 @@ static rct_widget window_footpath_widgets[] = {
MakeWidget({ 3, 321}, {100, 54}, WindowWidgetType::Groupbox, WindowColour::Primary ),
MakeWidget({13, 332}, { 36, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_CONSTRUCTION_FOOTPATH_LAND, STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP ),
MakeWidget({57, 332}, { 36, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_CONSTRUCTION_FOOTPATH_BRIDGE, STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP ),
{WIDGETS_END},
WIDGETS_END,
};
static void window_footpath_close(rct_window * w);

2
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -62,7 +62,7 @@ static rct_widget window_game_bottom_toolbar_widgets[] =
MakeWidget({498, 0}, {142, 34}, WindowWidgetType::ImgBtn, WindowColour::Primary ), // Right outset panel
MakeWidget({500, 2}, {138, 30}, WindowWidgetType::ImgBtn, WindowColour::Primary ), // Right inset panel
MakeWidget({500, 2}, {138, 12}, WindowWidgetType::FlatBtn, WindowColour::Primary ), // Date
{ WIDGETS_END },
WIDGETS_END,
};
uint8_t gToolbarDirtyFlags;

14
src/openrct2-ui/windows/Guest.cpp
View File

@ -95,38 +95,38 @@ static rct_widget window_guest_overview_widgets[] = {
MakeWidget({167, 69}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_RENAME, STR_NAME_GUEST_TIP ), // Rename Button
MakeWidget({167, 93}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // Locate Button
MakeWidget({167, 117}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_TRACK_PEEP, STR_TOGGLE_GUEST_TRACKING_TIP), // Track Button
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_guest_stats_widgets[] = {
MAIN_GUEST_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_guest_rides_widgets[] = {
MAIN_GUEST_WIDGETS,
MakeWidget({3, 57}, {186, 87}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_guest_finance_widgets[] = {
MAIN_GUEST_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_guest_thoughts_widgets[] = {
MAIN_GUEST_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_guest_inventory_widgets[] = {
MAIN_GUEST_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_guest_debug_widgets[] = {
MAIN_GUEST_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
// 0x981D0C

2
src/openrct2-ui/windows/GuestList.cpp
View File

@ -60,7 +60,7 @@ static rct_widget window_guest_list_widgets[] = {
MakeTab ({ 3, 17}, STR_INDIVIDUAL_GUESTS_TIP ), // tab 1
MakeTab ({ 34, 17}, STR_SUMMARISED_GUESTS_TIP ), // tab 2
MakeWidget({ 3, 72}, {344, 255}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_BOTH ), // guest list
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/InstallTrack.cpp
View File

@ -48,7 +48,7 @@ static rct_widget window_install_track_widgets[] = {
MakeWidget({PREVIEW_BUTTONS_LEFT, 398}, { 22, 24}, WindowWidgetType::FlatBtn, WindowColour::Primary, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP),
MakeWidget({ ACTION_BUTTONS_LEFT, 241}, { 97, 15}, WindowWidgetType::Button, WindowColour::Primary, STR_INSTALL_NEW_TRACK_DESIGN_INSTALL ),
MakeWidget({ ACTION_BUTTONS_LEFT, 259}, { 97, 15}, WindowWidgetType::Button, WindowColour::Primary, STR_INSTALL_NEW_TRACK_DESIGN_CANCEL ),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_install_track_close(rct_window *w);

2
src/openrct2-ui/windows/Land.cpp
View File

@ -47,7 +47,7 @@ static rct_widget window_land_widgets[] = {
MakeRemapWidget({54, 63}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::Secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size
MakeWidget ({ 2, 106}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP), // floor texture
MakeWidget ({49, 106}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), // wall texture
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/LandRights.cpp
View File

@ -43,7 +43,7 @@ static rct_widget window_land_rights_widgets[] = {
MakeRemapWidget({54, 32}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::Tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size
MakeRemapWidget({22, 53}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Tertiary, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_RIGHTS_TIP ), // land rights
MakeRemapWidget({52, 53}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Tertiary, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUY_CONSTRUCTION_RIGHTS_TIP ), // construction rights
{ WIDGETS_END },
WIDGETS_END,
};
static void window_land_rights_close(rct_window *w);

4
src/openrct2-ui/windows/LoadSave.cpp
View File

@ -73,7 +73,7 @@ static rct_widget window_loadsave_widgets[] =
MakeWidget({(WW - 5) / 2 + 1, 55}, {170, 14}, WindowWidgetType::TableHeader, WindowColour::Primary ), // Date
MakeWidget({ 4, 68}, {342, 303}, WindowWidgetType::Scroll, WindowColour::Primary , SCROLL_VERTICAL ), // File list
MakeWidget({ 4, WH - 24}, {197, 19}, WindowWidgetType::Button, WindowColour::Primary , STR_FILEBROWSER_USE_SYSTEM_WINDOW ), // Use native browser
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion
@ -1142,7 +1142,7 @@ static rct_widget window_overwrite_prompt_widgets[] = {
{ WindowWidgetType::Button, 0, 10, 94, OVERWRITE_WH - 20, OVERWRITE_WH - 9, STR_FILEBROWSER_OVERWRITE_TITLE, STR_NONE },
{ WindowWidgetType::Button, 0, OVERWRITE_WW - 95, OVERWRITE_WW - 11, OVERWRITE_WH - 20, OVERWRITE_WH - 9,
STR_SAVE_PROMPT_CANCEL, STR_NONE },
{ WIDGETS_END }
WIDGETS_END,
};
static void window_overwrite_prompt_mouseup(rct_window* w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/Main.cpp
View File

@ -17,7 +17,7 @@
// clang-format off
static rct_widget window_main_widgets[] = {
MakeWidget({0, 0}, {0, 0}, WindowWidgetType::Viewport, WindowColour::Primary, STR_VIEWPORT),
{ WIDGETS_END },
WIDGETS_END,
};
void window_main_paint(rct_window *w, rct_drawpixelinfo *dpi);

2
src/openrct2-ui/windows/Map.cpp
View File

@ -117,7 +117,7 @@ static rct_widget window_map_widgets[] = {
MakeWidget ({ 58, 197}, {174, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP),
MakeWidget ({218, 45}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ),
MakeWidget ({110, 189}, {131, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_MAPGEN_WINDOW_TITLE, STR_MAP_GENERATOR_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
// used in transforming viewport view coordinates to minimap coordinates

8
src/openrct2-ui/windows/MapGen.cpp
View File

@ -129,7 +129,7 @@ static rct_widget MapWidgets[] = {
MakeSpinnerWidgets({104, 88}, {95, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // NB: 3 widgets
MakeWidget ({104, 106}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ),
MakeWidget ({151, 106}, {47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget RandomWidgets[] = {
@ -137,7 +137,7 @@ static rct_widget RandomWidgets[] = {
MakeWidget({155, 255}, { 90, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_MAPGEN_ACTION_GENERATE ),
MakeWidget({ 4, 52}, {195, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MAPGEN_OPTION_RANDOM_TERRAIN),
MakeWidget({ 4, 70}, {195, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MAPGEN_OPTION_PLACE_TREES ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget SimplexWidgets[] = {
@ -154,7 +154,7 @@ static rct_widget SimplexWidgets[] = {
MakeWidget ({102, 202}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), // WIDX_SIMPLEX_FLOOR_TEXTURE
MakeWidget ({150, 202}, { 47, 36}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), // WIDX_SIMPLEX_WALL_TEXTURE
MakeWidget ({104, 239}, { 95, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary ), // WIDX_SIMPLEX_PLACE_TREES_CHECKBOX
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget HeightmapWidgets[] = {
@ -167,7 +167,7 @@ static rct_widget HeightmapWidgets[] = {
MakeSpinnerWidgets({104, 124}, { 95, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN}
MakeSpinnerWidgets({104, 142}, { 95, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN}
MakeSpinnerWidgets({104, 160}, { 95, 12}, WindowWidgetType::Spinner, WindowColour::Secondary ), // WIDX_HEIGHTMAP_WATER_LEVEL{,_UP,_DOWN}
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *PageWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {

2
src/openrct2-ui/windows/MapTooltip.cpp
View File

@ -19,7 +19,7 @@
// clang-format off
static rct_widget window_map_tooltip_widgets[] = {
MakeWidget({0, 0}, {200, 30}, WindowWidgetType::ImgBtn, WindowColour::Primary),
{ WIDGETS_END }
WIDGETS_END,
};
static void window_map_tooltip_update(rct_window *w);

2
src/openrct2-ui/windows/MazeConstruction.cpp
View File

@ -78,7 +78,7 @@ static rct_widget window_maze_construction_widgets[] = {
MakeWidget({87, 178}, { 70, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ),
MakeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::Primary ),
MakeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::Primary ),
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion

8
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -69,7 +69,7 @@ enum WINDOW_MULTIPLAYER_WIDGET_IDX {
static rct_widget window_multiplayer_information_widgets[] = {
MAIN_MULTIPLAYER_WIDGETS,
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_multiplayer_players_widgets[] = {
@ -79,7 +79,7 @@ static rct_widget window_multiplayer_players_widgets[] = {
MakeWidget({259, 46}, {100, 15}, WindowWidgetType::TableHeader, WindowColour::Primary , STR_LAST_ACTION), // Player name
MakeWidget({359, 46}, { 42, 15}, WindowWidgetType::TableHeader, WindowColour::Primary , STR_PING ), // Player name
MakeWidget({ 3, 60}, {334, 177}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL), // list
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_multiplayer_groups_widgets[] = {
@ -92,7 +92,7 @@ static rct_widget window_multiplayer_groups_widgets[] = {
MakeWidget({ 72, 80}, {175, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ), // selected group
MakeWidget({236, 81}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH),
MakeWidget({ 3, 94}, {314, 207}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL ), // permissions list
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_multiplayer_options_widgets[] = {
@ -100,7 +100,7 @@ static rct_widget window_multiplayer_options_widgets[] = {
MakeWidget({3, 50}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_LOG_CHAT, STR_LOG_CHAT_TIP ),
MakeWidget({3, 64}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_LOG_SERVER_ACTIONS, STR_LOG_SERVER_ACTIONS_TIP ),
MakeWidget({3, 78}, {295, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_ALLOW_KNOWN_KEYS_ONLY, STR_ALLOW_KNOWN_KEYS_ONLY_TIP),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget *window_multiplayer_page_widgets[] = {

2
src/openrct2-ui/windows/NetworkStatus.cpp
View File

@ -28,7 +28,7 @@ static rct_widget window_network_status_widgets[] = {
MakeWidget({ 0, 0}, {441, 91}, WindowWidgetType::Frame, WindowColour::Primary ), // panel / background
MakeWidget({ 1, 1}, {438, 14}, WindowWidgetType::Caption, WindowColour::Primary, STR_NONE, STR_WINDOW_TITLE_TIP), // title bar
MakeWidget({427, 2}, { 11, 12}, WindowWidgetType::CloseBox, WindowColour::Primary, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), // close x button
{ WIDGETS_END },
WIDGETS_END,
};
static char window_network_status_text[1024];

2
src/openrct2-ui/windows/NewCampaign.cpp
View File

@ -49,7 +49,7 @@ static rct_widget window_new_campaign_widgets[] = {
MakeWidget ({ 14, 41}, {126, 14}, WindowWidgetType::Label, WindowColour::Primary, STR_LENGTH_OF_TIME ), // weeks label
MakeSpinnerWidgets({120, 41}, {100, 14}, WindowWidgetType::Spinner, WindowColour::Primary, STR_EMPTY ), // weeks (3 widgets)
MakeWidget ({ 14, 89}, {322, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN), // start button
{ WIDGETS_END }
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/NewRide.cpp
View File

@ -204,7 +204,7 @@ static rct_widget window_new_ride_widgets[] = {
MakeWidget({ 3, 124}, {290, 65}, WindowWidgetType::Groupbox, WindowColour::Tertiary , STR_LAST_DEVELOPMENT ),
MakeWidget({265, 161}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Tertiary , 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ),
MakeWidget({265, 68}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Tertiary , SPR_FINANCE, STR_FINANCES_RESEARCH_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
#pragma endregion

2
src/openrct2-ui/windows/News.cpp
View File

@ -38,7 +38,7 @@ static rct_widget window_news_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
MakeWidget({372, 18}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Primary, SPR_TAB_GEARS_0), // settings
MakeWidget({ 4, 44}, {392, 252}, WindowWidgetType::Scroll, WindowColour::Primary, SCROLL_VERTICAL), // scroll
{ WIDGETS_END },
WIDGETS_END,
};
class NewsWindow final : public Window

2
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -80,7 +80,7 @@ static rct_widget window_news_options_widgets[] = {
MakeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::Tertiary ),
MakeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::Tertiary ),
MakeWidget({ 0, 0}, {343, 14}, WindowWidgetType::Checkbox, WindowColour::Tertiary ),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_news_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/ObjectLoadError.cpp
View File

@ -282,7 +282,7 @@ static rct_widget window_object_load_error_widgets[] = {
#ifndef DISABLE_HTTP
MakeWidget({ 300, 377}, {146, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_DOWNLOAD_ALL, STR_DOWNLOAD_ALL_TIP ), // Download all button
#endif
{ WIDGETS_END },
WIDGETS_END,
};
static rct_string_id get_object_type_string(ObjectType type);

14
src/openrct2-ui/windows/Options.cpp
View File

@ -226,7 +226,7 @@ static rct_widget window_options_display_widgets[] = {
MakeWidget ({ 11, 176}, {143, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_USE_VSYNC, STR_USE_VSYNC_TIP ), // Use vsync
MakeWidget ({ 11, 191}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS_TIP), // Minimise fullscreen focus loss
MakeWidget ({ 11, 206}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_DISABLE_SCREENSAVER, STR_DISABLE_SCREENSAVER_TIP ), // Disable screensaver
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_options_rendering_widgets[] = {
@ -250,7 +250,7 @@ static rct_widget window_options_rendering_widgets[] = {
MakeWidget({10, FRAME_EFFECTS_START + 60}, {281, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_RENDER_WEATHER_EFFECTS, STR_RENDER_WEATHER_EFFECTS_TIP ), // Render weather effects
MakeWidget({25, FRAME_EFFECTS_START + 75}, {266, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_DISABLE_LIGHTNING_EFFECT, STR_DISABLE_LIGHTNING_EFFECT_TIP), // Disable lightning effect
#undef FRAME_EFFECTS_START
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_options_culture_widgets[] = {
@ -267,7 +267,7 @@ static rct_widget window_options_culture_widgets[] = {
MakeWidget({288, 114}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_HEIGHT_LABELS_UNITS_TIP),
MakeWidget({155, 128}, {145, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ), // Date format
MakeWidget({288, 129}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DATE_FORMAT_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_options_audio_widgets[] = {
@ -284,7 +284,7 @@ static rct_widget window_options_audio_widgets[] = {
MakeWidget({155, 68}, {145, 13}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_HORIZONTAL ), // Master volume
MakeWidget({155, 83}, {145, 13}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_HORIZONTAL ), // Sound effect volume
MakeWidget({155, 98}, {145, 13}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_HORIZONTAL ), // Music volume
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_options_controls_and_interface_widgets[] = {
@ -312,7 +312,7 @@ static rct_widget window_options_controls_and_interface_widgets[] = {
MakeWidget({ 24, TOOLBAR_GROUP_START + 61}, {162, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute
MakeWidget({155, TOOLBAR_GROUP_START + 61}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat
MakeWidget({ 24, TOOLBAR_GROUP_START + 76}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_ZOOM_BUTTON_ON_TOOLBAR, STR_ZOOM_BUTTON_ON_TOOLBAR_TIP ), // Zoom
{ WIDGETS_END },
WIDGETS_END,
#undef TOOLBAR_GROUP_START
};
@ -343,7 +343,7 @@ static rct_widget window_options_misc_widgets[] = {
MakeWidget({175, TWEAKS_START + 61}, {125, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ), // Default inspection time dropdown
MakeWidget({288, TWEAKS_START + 62}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DEFAULT_INSPECTION_INTERVAL_TIP), // Default inspection time dropdown button
#undef TWEAKS_START
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_options_advanced_widgets[] = {
@ -359,7 +359,7 @@ static rct_widget window_options_advanced_widgets[] = {
MakeWidget ({ 23, 169}, {276, 12}, WindowWidgetType::Label, WindowColour::Secondary, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP ), // RCT 1 path text
MakeWidget ({ 24, 184}, {266, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_NONE, STR_STRING_TOOLTIP ), // RCT 1 path button
MakeWidget ({289, 184}, { 11, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_CLOSE_X, STR_PATH_TO_RCT1_CLEAR_TIP ), // RCT 1 path clear button
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_options_page_widgets[] = {

14
src/openrct2-ui/windows/Park.cpp
View File

@ -99,40 +99,40 @@ static rct_widget window_park_entrance_widgets[] = {
MakeWidget({205, 121}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_RENAME, STR_NAME_PARK_TIP ), // rename
MakeWidget({210, 51}, { 14, 15}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_PARK_TIP ),
MakeWidget({210, 66}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_PARK_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_park_rating_widgets[] = {
MAIN_PARK_WIDGETS(255),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_park_guests_widgets[] = {
MAIN_PARK_WIDGETS(255),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_park_price_widgets[] = {
MAIN_PARK_WIDGETS(230),
MakeWidget ({ 21, 50}, {126, 14}, WindowWidgetType::Label, WindowColour::Secondary, STR_ADMISSION_PRICE),
MakeSpinnerWidgets({147, 50}, { 76, 14}, WindowWidgetType::Spinner, WindowColour::Secondary ), // Price (3 widgets)
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_park_stats_widgets[] = {
MAIN_PARK_WIDGETS(230),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_park_objective_widgets[] = {
MAIN_PARK_WIDGETS(230),
MakeWidget({7, 207}, {216, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_ENTER_NAME_INTO_SCENARIO_CHART), // enter name
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_park_awards_widgets[] = {
MAIN_PARK_WIDGETS(230),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_park_page_widgets[] = {

4
src/openrct2-ui/windows/Player.cpp
View File

@ -63,12 +63,12 @@ static rct_widget window_player_overview_widgets[] = {
MakeWidget({179, 45}, { 12, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_PLAYER_TIP), // Locate button
MakeWidget({179, 69}, { 12, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_DEMOLISH, STR_KICK_PLAYER_TIP ), // Kick button
MakeWidget({ 3, 60}, {175, 61}, WindowWidgetType::Viewport, WindowColour::Secondary ), // Viewport
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_player_statistics_widgets[] = {
WINDOW_PLAYER_COMMON_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_player_page_widgets[] = {

4
src/openrct2-ui/windows/Research.cpp
View File

@ -68,7 +68,7 @@ static rct_widget window_research_development_widgets[] = {
MakeWidget({ 3, 47}, {WW_DEVELOPMENT - 10, 70}, WindowWidgetType::Groupbox, WindowColour::Tertiary , STR_CURRENTLY_IN_DEVELOPMENT ),
MakeWidget({ 3, 124}, {WW_DEVELOPMENT - 10, 65}, WindowWidgetType::Groupbox, WindowColour::Tertiary , STR_LAST_DEVELOPMENT ),
MakeWidget({265, 161}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Tertiary , 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget window_research_funding_widgets[] = {
@ -87,7 +87,7 @@ static rct_widget window_research_funding_widgets[] = {
MakeWidget({ 8, 160}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ),
MakeWidget({ 8, 173}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ),
MakeWidget({ 8, 186}, {WW_FUNDING - 16, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_research_page_widgets[] = {

20
src/openrct2-ui/windows/Ride.cpp
View File

@ -246,7 +246,7 @@ static rct_widget window_ride_main_widgets[] = {
MakeWidget({296, 76}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_RIDE_TIP ),
MakeWidget({ 3, 180}, {305, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_ARG_6_STRINGID ),
MakeWidget({297, 180}, { 11, 12}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009ADDA8
@ -257,7 +257,7 @@ static rct_widget window_ride_vehicle_widgets[] = {
MakeWidget ({ 7, 147}, {302, 43}, WindowWidgetType::Scroll, WindowColour::Secondary, STR_EMPTY ),
MakeSpinnerWidgets({ 7, 196}, {145, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP ),
MakeSpinnerWidgets({164, 196}, {145, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009ADEFC
@ -280,7 +280,7 @@ static rct_widget window_ride_operating_widgets[] = {
MakeWidget ({297, 110}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH ),
MakeWidget ({ 21, 89}, {129, 12}, WindowWidgetType::Label, WindowColour::Secondary, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP ),
MakeSpinnerWidgets({157, 89}, {152, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_NUMBER_OF_CIRCUITS_VALUE ), // NB: 3 widgets
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE190
@ -291,7 +291,7 @@ static rct_widget window_ride_maintenance_widgets[] = {
MakeWidget({289, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP ),
MakeWidget({265, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_CONSTRUCTION, STR_REFURBISH_RIDE_TIP ),
MakeWidget({241, 108}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_NO_ENTRY, STR_DEBUG_FORCE_BREAKDOWN_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE2A4
@ -317,7 +317,7 @@ static rct_widget window_ride_colour_widgets[] = {
MakeWidget({ 79, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ),
MakeWidget({ 99, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ),
MakeWidget({119, 190}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE4C8
@ -326,7 +326,7 @@ static rct_widget window_ride_music_widgets[] = {
MakeWidget({ 7, 47}, {302, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP ),
MakeWidget({ 7, 62}, {302, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary, STR_EMPTY ),
MakeWidget({297, 63}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE5DC
@ -337,7 +337,7 @@ static rct_widget window_ride_measurements_widgets[] = {
MakeWidget({158, 127}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RESET_SELECTION ),
MakeWidget({ 4, 177}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_DESIGN_SAVE ),
MakeWidget({158, 177}, {154, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_DESIGN_CANCEL ),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE710
@ -348,7 +348,7 @@ static rct_widget window_ride_graphs_widgets[] = {
MakeWidget({ 76, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP ),
MakeWidget({149, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP),
MakeWidget({222, 163}, { 73, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE844
@ -360,7 +360,7 @@ static rct_widget window_ride_income_widgets[] = {
MakeWidget ({ 19, 94}, {126, 14}, WindowWidgetType::Label, WindowColour::Secondary ),
MakeSpinnerWidgets({147, 94}, {162, 14}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_RIDE_SECONDARY_PRICE_VALUE ), // NB: 3 widgets
MakeWidget ({ 5, 106}, {306, 13}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP),
{ WIDGETS_END },
WIDGETS_END,
};
// 0x009AE9C8
@ -369,7 +369,7 @@ static rct_widget window_ride_customer_widgets[] = {
MakeWidget({289, 54}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION_TIP),
MakeWidget({289, 78}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION_TIP ),
MakeWidget({289, 102}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_ride_page_widgets[] = {

2
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -132,7 +132,7 @@ static rct_widget window_ride_construction_widgets[] = {
MakeWidget ({ 96, 120}, { 67, 41}, WindowWidgetType::Groupbox, WindowColour::Primary , STR_RIDE_CONSTRUCTION_SEAT_ROT ),
MakeSpinnerWidgets({101, 138}, { 58, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP),
MakeWidget ({139, 338}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_SIMULATE, STR_SIMULATE_RIDE_TIP ),
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion

2
src/openrct2-ui/windows/RideList.cpp
View File

@ -69,7 +69,7 @@ static rct_widget window_ride_list_widgets[] = {
MakeWidget({320, 62}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_CLOSE_BUTTON_0 ),
MakeWidget({320, 76}, { 14, 14}, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0 ),
MakeWidget({315, 90}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_DEMOLISH, STR_QUICK_DEMOLISH_RIDE ),
{ WIDGETS_END },
WIDGETS_END,
};
static bool _quickDemolishMode = false;

4
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -42,7 +42,7 @@ static rct_widget window_save_prompt_widgets[] = {
MakeWidget({ 8, 35}, { 78, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_SAVE_PROMPT_SAVE ), // save
MakeWidget({ 91, 35}, { 78, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_SAVE_PROMPT_DONT_SAVE), // don't save
MakeWidget({174, 35}, { 78, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL ), // cancel
{ WIDGETS_END },
WIDGETS_END,
};
enum WINDOW_QUIT_PROMPT_WIDGET_IDX {
@ -57,7 +57,7 @@ static rct_widget window_quit_prompt_widgets[] = {
WINDOW_SHIM_WHITE(STR_QUIT_GAME_PROMPT_TITLE, WW_QUIT, WH_QUIT),
MakeWidget({ 8, 19}, {78, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_OK ), // ok
MakeWidget({91, 19}, {78, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_CANCEL), // cancel
{ WIDGETS_END },
WIDGETS_END,
};
static constexpr const rct_string_id window_save_prompt_labels[][2] = {

2
src/openrct2-ui/windows/ScenarioSelect.cpp
View File

@ -86,7 +86,7 @@ static rct_widget window_scenarioselect_widgets[] = {
MakeRemapWidget({594, 17}, { 91, 34}, WindowWidgetType::Tab, WindowColour::Secondary, SPR_TAB_LARGE), // tab 7
MakeRemapWidget({685, 17}, { 91, 34}, WindowWidgetType::Tab, WindowColour::Secondary, SPR_TAB_LARGE), // tab 8
MakeWidget ({ 3, 54}, { WW - SidebarWidth, 276 }, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL), // level list
{ WIDGETS_END },
WIDGETS_END,
};
static constexpr const rct_string_id ScenarioOriginStringIds[] = {

2
src/openrct2-ui/windows/Scenery.cpp
View File

@ -171,7 +171,7 @@ static rct_widget window_scenery_widgets[] = {
MakeWidget ({615, 117}, { 12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR ), // 20000000 0x009DE468
MakeWidget ({609, 130}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_EYEDROPPER, STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478
MakeWidget ({609, 154}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/SceneryScatter.cpp
View File

@ -47,7 +47,7 @@ static rct_widget window_scenery_scatter_widgets[] = {
MakeRemapWidget({ 7, 68}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW ), // low amount
MakeRemapWidget({31, 68}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM), // medium amount
MakeRemapWidget({55, 68}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH ), // high amount
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/ServerList.cpp
View File

@ -66,7 +66,7 @@ static rct_widget window_server_list_widgets[] = {
MakeWidget({ 6, 53}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_FETCH_SERVERS ), // fetch servers button
MakeWidget({112, 53}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_ADD_SERVER ), // add server button
MakeWidget({218, 53}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_START_SERVER ), // start server button
{ WIDGETS_END },
WIDGETS_END,
};
static void window_server_list_close(rct_window *w);

2
src/openrct2-ui/windows/ServerStart.cpp
View File

@ -62,7 +62,7 @@ static rct_widget window_server_start_widgets[] = {
MakeWidget ({ 6, 117}, {287, 14}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP), // advertise checkbox
MakeWidget ({ 6, WH-6-13}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_NEW_GAME ), // start server button
MakeWidget ({ 112, WH-6-13}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_LOAD_GAME ), // None
{ WIDGETS_END },
WIDGETS_END,
};
static void window_server_start_close(rct_window *w);

6
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@ -42,7 +42,7 @@ static rct_widget window_shortcut_widgets[] = {
MakeWidget({0, 43}, {350, 287}, WindowWidgetType::Resize, WindowColour::Secondary),
MakeWidget({4, 47}, {412, 245}, WindowWidgetType::Scroll, WindowColour::Primary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ),
MakeWidget({4, WH-15}, {150, 12}, WindowWidgetType::Button, WindowColour::Primary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP),
{ WIDGETS_END }
WIDGETS_END,
};
// clang-format on
@ -59,7 +59,7 @@ enum
static rct_widget window_shortcut_change_widgets[] = {
WINDOW_SHIM(CHANGE_WINDOW_TITLE, CHANGE_WW, CHANGE_WH),
MakeWidget({ 75, 56 }, { 100, 14 }, WindowWidgetType::Button, WindowColour::Primary, STR_SHORTCUT_REMOVE, STR_SHORTCUT_REMOVE_TIP),
{ WIDGETS_END }
WIDGETS_END,
};
// clang-format on
@ -435,7 +435,7 @@ private:
enabled_widgets |= (1ULL << (WIDX_TAB_0 + i));
}
_widgets.push_back({ WIDGETS_END });
_widgets.push_back(WIDGETS_END);
widgets = _widgets.data();
WindowInitScrollWidgets(this);

2
src/openrct2-ui/windows/Sign.cpp
View File

@ -49,7 +49,7 @@ static rct_widget window_sign_widgets[] = {
MakeWidget({WW - 25, 67}, {24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_DEMOLISH, STR_DEMOLISH_SIGN_TIP ), // demolish button
MakeWidget({ 5, WH - 16}, {12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // Main colour
MakeWidget({ 17, WH - 16}, {12, 12}, WindowWidgetType::ColourBtn, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_TEXT_COLOUR_TIP ), // Text colour
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

6
src/openrct2-ui/windows/Staff.cpp
View File

@ -86,7 +86,7 @@ static rct_widget window_staff_overview_widgets[] = {
MakeWidget ({WW - 25, 93}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_RENAME, STR_NAME_STAFF_TIP ), // Rename Button
MakeWidget ({WW - 25, 117}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // Locate Button
MakeWidget ({WW - 25, 141}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_DEMOLISH, STR_FIRE_STAFF_TIP ), // Fire Button
{ WIDGETS_END },
WIDGETS_END,
};
//0x9AF910
@ -98,13 +98,13 @@ static rct_widget window_staff_options_widgets[] = {
MakeWidget ({ 5, 101}, {180, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary ), // Checkbox 4
MakeWidget ({ 5, 50}, {180, 12}, WindowWidgetType::DropdownMenu, WindowColour::Secondary ), // Costume Dropdown
MakeWidget ({WW - 17, 51}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_COSTUME_TIP), // Costume Dropdown Button
{ WIDGETS_END },
WIDGETS_END,
};
//0x9AF9F4
static rct_widget window_staff_stats_widgets[] = {
MAIN_STAFF_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *window_staff_page_widgets[] = {

2
src/openrct2-ui/windows/StaffFirePrompt.cpp
View File

@ -34,7 +34,7 @@ static rct_widget window_staff_fire_widgets[] = {
WINDOW_SHIM_WHITE(WINDOW_TITLE, WW, WH),
MakeWidget({ 10, WH - 20}, {85, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_YES ),
MakeWidget({WW - 95, WH - 20}, {85, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL),
{ WIDGETS_END }
WIDGETS_END,
};
static void window_staff_fire_mouseup(rct_window *w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/StaffList.cpp
View File

@ -77,7 +77,7 @@ static rct_widget window_staff_list_widgets[] = {
MakeWidget({243, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF ), // quick fire staff
MakeWidget({267, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool
MakeWidget({291, 46}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Secondary, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP ), // show staff on map button
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/TextInput.cpp
View File

@ -34,7 +34,7 @@ static rct_widget window_text_input_widgets[] = {
WINDOW_SHIM(STR_NONE, WW, WH),
MakeWidget({ 170, 68 }, { 71, 14 }, WindowWidgetType::Button, WindowColour::Secondary, STR_CANCEL),
MakeWidget({ 10, 68 }, { 71, 14 }, WindowWidgetType::Button, WindowColour::Secondary, STR_OK),
{ WIDGETS_END }
WIDGETS_END,
};
class TextInputWindow final : public Window

2
src/openrct2-ui/windows/Themes.cpp
View File

@ -123,7 +123,7 @@ static rct_widget window_themes_widgets[] = {
MakeWidget({ 10, 69}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights
MakeWidget({ 10, 84}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font
MakeWidget({ 10, 99}, {290, 12}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar
{ WIDGETS_END },
WIDGETS_END,
};
static int32_t window_themes_tab_animation_loops[] = {

20
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -241,7 +241,7 @@ constexpr int32_t BUTTONH = 17;
static rct_widget DefaultWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
{ WIDGETS_END },
WIDGETS_END,
};
// Group boxes .top and .bottom for a given window height offsets from the bottom
@ -259,7 +259,7 @@ static rct_widget SurfaceWidgets[] = {
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - SUR_GBPT, 2) + 7 * 2), STR_NONE, STR_NONE }, // WIDX_SURFACE_CHECK_CORNER_S
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 0, GBBT(WH - SUR_GBPT, 2) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_SURFACE_CHECK_CORNER_W
{ WindowWidgetType::Checkbox, 1, GBBF(WH - SUR_GBPT, 0, 4), STR_TILE_INSPECTOR_SURFACE_DIAGONAL, STR_NONE }, // WIDX_SURFACE_CHECK_DIAGONAL
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t PAT_GBPB = PADDING_BOTTOM; // Path group box properties bottom
@ -279,7 +279,7 @@ static rct_widget PathWidgets[] = {
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 0, GBBT(WH - PAT_GBPT, 2) + 7 * 2), STR_NONE, STR_NONE }, // WIDX_PATH_CHECK_EDGE_W
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - PAT_GBPT, 2) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_PATH_CHECK_EDGE_NW
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 2, GBBT(WH - PAT_GBPT, 2) + 7 * 0), STR_NONE, STR_NONE }, // WIDX_PATH_CHECK_EDGE_N
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t TRA_GBPB = PADDING_BOTTOM; // Track group box properties bottom
@ -293,7 +293,7 @@ static rct_widget TrackWidgets[] = {
{ WindowWidgetType::Checkbox, 1, GBBF(WH - TRA_GBPT, 0, 2), STR_TILE_INSPECTOR_TRACK_CHAIN_LIFT, STR_NONE }, // WIDX_TRACK_CHECK_CHAIN_LIFT
{ WindowWidgetType::Checkbox, 1, GBBF(WH - TRA_GBPT, 0, 3), STR_TILE_INSPECTOR_TRACK_BLOCK_BRAKE, STR_NONE }, // WIDX_PATH_CHECK_BLOCK_BRAKE_CLOSED
{ WindowWidgetType::Checkbox, 1, GBBF(WH - TRA_GBPT, 0, 4), STR_TILE_INSPECTOR_TRACK_IS_INDESTRUCTIBLE, STR_NONE }, // WIDX_PATH_CHECK_IS_INDESTRUCTIBLE
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t SCE_GBPB = PADDING_BOTTOM; // Scenery group box properties bottom
@ -311,7 +311,7 @@ static rct_widget SceneryWidgets[] = {
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 2, GBBT(WH - SCE_GBPT, 2) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_SCENERY_CHECK_COLLISION_E
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - SCE_GBPT, 2) + 7 * 2), STR_NONE, STR_NONE }, // WIDX_SCENERY_CHECK_COLLISION_S
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 0, GBBT(WH - SCE_GBPT, 2) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_SCENERY_CHECK_COLLISION_W
{ WIDGETS_END },
WIDGETS_END,
};
@ -323,7 +323,7 @@ static rct_widget EntranceWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - ENT_GBPT, 0) + 3, GBBB(WH - ENT_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_ENTRANCE_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WindowWidgetType::Button, 1, GBB(WH - ENT_GBPT, 0, 1), STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE, STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE_TIP }, // WIDX_ENTRANCE_BUTTON_MAKE_USABLE
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t WALL_GBPB = PADDING_BOTTOM; // Wall group box properties bottom
@ -336,7 +336,7 @@ static rct_widget WallWidgets[] = {
{ WindowWidgetType::DropdownMenu, 1, GBD(WH - WALL_GBPT, 1, 1), STR_NONE, STR_NONE }, // WIDX_WALL_DROPDOWN_SLOPE
{ WindowWidgetType::Button, 1, GBDB(WH - WALL_GBPT, 1, 1), STR_DROPDOWN_GLYPH, STR_NONE }, // WIDX_WALL_DROPDOWN_SLOPE_BUTTON
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - WALL_GBPT, 2) + 3, GBBB(WH - WALL_GBPT, 2) - 3, STR_NONE, STR_NONE), // WIDX_WALL_SPINNER_ANIMATION_FRAME{,_INCREASE,_DECREASE}
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t LAR_GBPB = PADDING_BOTTOM; // Large scenery group box properties bottom
@ -346,7 +346,7 @@ constexpr int32_t LAR_GBDT = LAR_GBDB + 20 + 3 * 11; // Large scenery grou
static rct_widget LargeSceneryWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - LAR_GBPT, 0) + 3, GBBB(WH - LAR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_LARGE_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t BAN_GBPB = PADDING_BOTTOM; // Banner group box properties bottom
@ -361,7 +361,7 @@ static rct_widget BannerWidgets[] = {
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - BAN_GBPT, 1) + 7 * 3), STR_NONE, STR_NONE }, // WIDX_BANNER_CHECK_BLOCK_SW
{ WindowWidgetType::Checkbox, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - BAN_GBPT, 1) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_BANNER_CHECK_BLOCK_NW
{ WIDGETS_END },
WIDGETS_END,
};
constexpr int32_t COR_GBPB = PADDING_BOTTOM; // Corrupt element group box properties bottom
@ -372,7 +372,7 @@ static rct_widget CorruptWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - COR_GBPT, 0) + 3, GBBB(WH - COR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_CORRUPT_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WindowWidgetType::Button, 1, GBB(WH - SUR_GBPT, 0, 1), STR_TILE_INSPECTOR_CLAMP_TO_NEXT, STR_TILE_INSPECTOR_CLAMP_TO_NEXT_TIP }, // WIDX_CORRUPT_BUTTON_CLAMP
{ WIDGETS_END },
WIDGETS_END,
};
static rct_widget *PageWidgets[] = {

2
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@ -106,7 +106,7 @@ static rct_widget window_title_command_editor_widgets[] = {
MakeWidget({ 10, 99}, { 71, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_OK ), // OKAY
MakeWidget({120, 99}, { 71, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_CANCEL ), // Cancel
{ WIDGETS_END },
WIDGETS_END,
};
static void window_title_command_editor_close(rct_window * w);

2
src/openrct2-ui/windows/TitleEditor.cpp
View File

@ -171,7 +171,7 @@ static rct_widget window_title_editor_widgets[] = {
MakeWidget ({ 26, 238}, PLAYBACK_BTN, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_TITLE_STOP, STR_TITLE_EDITOR_ACTION_STOP_TIP ), // Stop
MakeWidget ({ 44, 238}, PLAYBACK_BTN, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_TITLE_PLAY, STR_TITLE_EDITOR_ACTION_PLAY_TIP ), // Play
MakeWidget ({ 62, 238}, PLAYBACK_BTN, WindowWidgetType::ImgBtn, WindowColour::Secondary, SPR_G2_TITLE_SKIP, STR_TITLE_EDITOR_ACTION_SKIP_TIP ), // Skip
{ WIDGETS_END },
WIDGETS_END,
};
static size_t _selectedTitleSequence = SIZE_MAX;

2
src/openrct2-ui/windows/TitleExit.cpp
View File

@ -22,7 +22,7 @@ enum WINDOW_TITLE_EXIT_WIDGET_IDX {
static rct_widget window_title_exit_widgets[] = {
MakeWidget({0, 0}, {40, 64}, WindowWidgetType::ImgBtn, WindowColour::Tertiary, SPR_MENU_EXIT, STR_EXIT),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_title_exit_paint(rct_window *w, rct_drawpixelinfo *dpi);

2
src/openrct2-ui/windows/TitleLogo.cpp
View File

@ -24,7 +24,7 @@ enum
static rct_widget window_title_logo_widgets[] = {
MakeWidget({ 0, 0 }, { WW + 1, WH + 1 }, WindowWidgetType::ImgBtn, WindowColour::Primary),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_title_menu_mouseup(rct_window* w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/TitleMenu.cpp
View File

@ -41,7 +41,7 @@ static rct_widget window_title_menu_widgets[] = {
MakeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WindowWidgetType::ImgBtn, WindowColour::Tertiary, SPR_G2_MENU_MULTIPLAYER, STR_SHOW_MULTIPLAYER_TIP),
MakeWidget({0, UpdateButtonDims.height}, MenuButtonDims, WindowWidgetType::ImgBtn, WindowColour::Tertiary, SPR_MENU_TOOLBOX, STR_GAME_TOOLS_TIP),
MakeWidget({0, 0}, UpdateButtonDims, WindowWidgetType::Empty, WindowColour::Secondary, STR_UPDATE_AVAILABLE),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_title_menu_mouseup(rct_window *w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/TitleOptions.cpp
View File

@ -21,7 +21,7 @@ enum WINDOW_TITLE_OPTIONS_WIDGET_IDX {
static rct_widget window_title_options_widgets[] = {
MakeWidget({0, 0}, {80, 15}, WindowWidgetType::Button, WindowColour::Tertiary, STR_OPTIONS, STR_OPTIONS_TIP),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_title_options_mouseup(rct_window *w, rct_widgetindex widgetIndex);

2
src/openrct2-ui/windows/Tooltip.cpp
View File

@ -22,7 +22,7 @@ enum {
static rct_widget window_tooltip_widgets[] = {
MakeWidget({0, 0}, {200, 32}, WindowWidgetType::ImgBtn, WindowColour::Primary),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_tooltip_update(rct_window *w);

2
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -263,7 +263,7 @@ static rct_widget window_top_toolbar_widgets[] = {
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network
MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat
MakeWidget ({ 0, 0}, {10, 1}, WindowWidgetType::Empty, WindowColour::Primary ), // Artificial widget separator
{ WIDGETS_END },
WIDGETS_END,
};
static void window_top_toolbar_mouseup(rct_window *w, rct_widgetindex widgetIndex);

4
src/openrct2-ui/windows/TrackDesignManage.cpp
View File

@ -40,14 +40,14 @@ static rct_widget window_track_manage_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
MakeWidget({ 10, 24}, {110, 12}, WindowWidgetType::Button, WindowColour::Primary, STR_TRACK_MANAGE_RENAME),
MakeWidget({130, 24}, {110, 12}, WindowWidgetType::Button, WindowColour::Primary, STR_TRACK_MANAGE_DELETE),
{ WIDGETS_END }
WIDGETS_END,
};
static rct_widget window_track_delete_prompt_widgets[] = {
WINDOW_SHIM(STR_DELETE_FILE, WW_DELETE_PROMPT, WH_DELETE_PROMPT),
MakeWidget({ 10, 54}, {110, 12}, WindowWidgetType::Button, WindowColour::Primary, STR_TRACK_MANAGE_DELETE),
MakeWidget({130, 54}, {110, 12}, WindowWidgetType::Button, WindowColour::Primary, STR_CANCEL ),
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion

2
src/openrct2-ui/windows/TrackDesignPlace.cpp
View File

@ -67,7 +67,7 @@ static rct_widget window_track_place_widgets[] = {
MakeWidget({173, 59}, { 24, 24}, WindowWidgetType::FlatBtn, WindowColour::Primary, SPR_MIRROR_ARROW, STR_MIRROR_IMAGE_TIP ),
MakeWidget({ 4, 109}, {192, 12}, WindowWidgetType::Button, WindowColour::Primary, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP),
MakeWidget({ 0, 0}, { 1, 1}, WindowWidgetType::Empty, WindowColour::Primary),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_track_place_close(rct_window *w);

2
src/openrct2-ui/windows/TrackList.cpp
View File

@ -57,7 +57,7 @@ static rct_widget window_track_list_widgets[] = {
MakeWidget({224, 18}, {372, 219}, WindowWidgetType::FlatBtn, WindowColour::Primary ),
MakeWidget({572, 405}, { ROTATE_AND_SCENERY_BUTTON_SIZE, ROTATE_AND_SCENERY_BUTTON_SIZE}, WindowWidgetType::FlatBtn, WindowColour::Primary , SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ),
MakeWidget({572, 381}, { ROTATE_AND_SCENERY_BUTTON_SIZE, ROTATE_AND_SCENERY_BUTTON_SIZE}, WindowWidgetType::FlatBtn, WindowColour::Primary , SPR_SCENERY, STR_TOGGLE_SCENERY_TIP ),
{ WIDGETS_END },
WIDGETS_END,
};
static void window_track_list_close(rct_window *w);

2
src/openrct2-ui/windows/ViewClipping.cpp
View File

@ -59,7 +59,7 @@ static rct_widget window_view_clipping_widgets[] = {
MakeWidget ({ 11, 105}, { 158, 17}, WindowWidgetType::Button, WindowColour::Primary, STR_VIEW_CLIPPING_SELECT_AREA ), // selector
MakeWidget ({ 11, 126}, { 158, 18}, WindowWidgetType::Button, WindowColour::Primary, STR_VIEW_CLIPPING_CLEAR_SELECTION ), // clear
{ WIDGETS_END }
WIDGETS_END,
};
#pragma endregion

2
src/openrct2-ui/windows/Viewport.cpp
View File

@ -47,7 +47,7 @@ static rct_widget window_viewport_widgets[] =
MakeWidget({WW - 25, 17}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::Primary , SPR_G2_ZOOM_IN, STR_ZOOM_IN_TIP ), // zoom in
MakeWidget({WW - 25, 41}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::Primary , SPR_G2_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // zoom out
MakeWidget({WW - 25, 65}, VIEWPORT_BUTTON, WindowWidgetType::FlatBtn, WindowColour::Primary , SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // locate
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2-ui/windows/Water.cpp
View File

@ -35,7 +35,7 @@ static rct_widget window_water_widgets[] = {
MakeWidget ({16, 17}, {44, 32}, WindowWidgetType::ImgBtn, WindowColour::Primary , SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box
MakeRemapWidget({17, 18}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::Tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP), // decrement size
MakeRemapWidget({43, 32}, {16, 16}, WindowWidgetType::TrnBtn, WindowColour::Tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP), // increment size
{ WIDGETS_END },
WIDGETS_END,
};
// clang-format on

2
src/openrct2/interface/Widget.h
View File

@ -40,7 +40,7 @@ enum class WindowWidgetType : uint8_t
Last = 26,
};
#define WIDGETS_END WindowWidgetType::Last, 0, 0, 0, 0, 0, 0, 0
constexpr const auto WIDGETS_END = rct_widget{ WindowWidgetType::Last, 0, 0, 0, 0, 0, 0, 0 };
#define BAR_BLINK (1u << 31)
#define SPINNER_INCREASE(l, r, t, b) (r) - 12, (r)-1, (t) + 1, (b)-1