From 45e7ee6a73a6004c2fd574cb3346748cff0d8595 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 27 Aug 2022 16:56:52 +0200 Subject: [PATCH] Rename rct_window_event_list to WindowEventList --- src/openrct2-ui/interface/Window.cpp | 9 +++----- .../windows/EditorObjectiveOptions.cpp | 6 ++--- .../windows/EditorScenarioOptions.cpp | 8 +++---- src/openrct2-ui/windows/Error.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/GameBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/InstallTrack.cpp | 2 +- src/openrct2-ui/windows/LoadSave.cpp | 4 ++-- src/openrct2-ui/windows/MapGen.cpp | 10 ++++----- src/openrct2-ui/windows/MapTooltip.cpp | 2 +- src/openrct2-ui/windows/Multiplayer.cpp | 10 ++++----- src/openrct2-ui/windows/NetworkStatus.cpp | 2 +- src/openrct2-ui/windows/Player.cpp | 6 ++--- src/openrct2-ui/windows/Research.cpp | 6 ++--- src/openrct2-ui/windows/Ride.cpp | 22 +++++++++---------- src/openrct2-ui/windows/SavePrompt.cpp | 2 +- src/openrct2-ui/windows/ScenarioSelect.cpp | 2 +- src/openrct2-ui/windows/ServerList.cpp | 2 +- src/openrct2-ui/windows/StaffFirePrompt.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2-ui/windows/TitleExit.cpp | 2 +- src/openrct2-ui/windows/TitleLogo.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 2 +- src/openrct2-ui/windows/TitleOptions.cpp | 2 +- src/openrct2-ui/windows/Tooltip.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2-ui/windows/TrackDesignManage.cpp | 4 ++-- src/openrct2/interface/Window.h | 13 +++++------ src/openrct2/interface/Window_internal.h | 2 +- 29 files changed, 65 insertions(+), 69 deletions(-) diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 7011393756..edfa6f7262 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -288,23 +288,20 @@ rct_window* WindowCreate( } rct_window* WindowCreate( - const ScreenCoordsXY& pos, int32_t width, int32_t height, rct_window_event_list* event_handlers, WindowClass cls, - uint32_t flags) + const ScreenCoordsXY& pos, int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags) { auto w = std::make_unique(); w->event_handlers = event_handlers; return WindowCreate(std::move(w), cls, pos, width, height, flags); } -rct_window* WindowCreateAutoPos( - int32_t width, int32_t height, rct_window_event_list* event_handlers, WindowClass cls, uint32_t flags) +rct_window* WindowCreateAutoPos(int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags) { auto pos = GetAutoPositionForNewWindow(width, height); return WindowCreate(pos, width, height, event_handlers, cls, flags); } -rct_window* WindowCreateCentred( - int32_t width, int32_t height, rct_window_event_list* event_handlers, WindowClass cls, uint32_t flags) +rct_window* WindowCreateCentred(int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags) { auto pos = GetCentrePositionForNewWindow(width, height); return WindowCreate(pos, width, height, event_handlers, cls, flags); diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 423a27ac04..0d0858a164 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -141,7 +141,7 @@ static void WindowEditorObjectiveOptionsRidesPaint(rct_window *w, rct_drawpixeli static void WindowEditorObjectiveOptionsRidesScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex); // 0x009A9DF4 -static rct_window_event_list window_objective_options_main_events([](auto& events) +static WindowEventList window_objective_options_main_events([](auto& events) { events.mouse_up = &WindowEditorObjectiveOptionsMainMouseup; events.resize = &WindowEditorObjectiveOptionsMainResize; @@ -154,7 +154,7 @@ static rct_window_event_list window_objective_options_main_events([](auto& event }); // 0x009A9F58 -static rct_window_event_list window_objective_options_rides_events([](auto& events) +static WindowEventList window_objective_options_rides_events([](auto& events) { events.mouse_up = &WindowEditorObjectiveOptionsRidesMouseup; events.resize = &WindowEditorObjectiveOptionsRidesResize; @@ -167,7 +167,7 @@ static rct_window_event_list window_objective_options_rides_events([](auto& even events.scroll_paint = &WindowEditorObjectiveOptionsRidesScrollpaint; }); -static rct_window_event_list *window_editor_objective_options_page_events[] = { +static WindowEventList *window_editor_objective_options_page_events[] = { &window_objective_options_main_events, &window_objective_options_rides_events, }; diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index f0ea9e80de..50ccdcd415 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -202,7 +202,7 @@ static void WindowEditorScenarioOptionsParkInvalidate(rct_window *w); static void WindowEditorScenarioOptionsParkPaint(rct_window *w, rct_drawpixelinfo *dpi); // 0x0097EB60 -static rct_window_event_list window_scenario_options_financial_events([](auto& events) +static WindowEventList window_scenario_options_financial_events([](auto& events) { events.mouse_up = &WindowEditorScenarioOptionsFinancialMouseup; events.resize = &WindowEditorScenarioOptionsFinancialResize; @@ -213,7 +213,7 @@ static rct_window_event_list window_scenario_options_financial_events([](auto& e }); // 0x0097EBD0 -static rct_window_event_list window_scenario_options_guests_events([](auto& events) +static WindowEventList window_scenario_options_guests_events([](auto& events) { events.mouse_up = &WindowEditorScenarioOptionsGuestsMouseup; events.resize = &WindowEditorScenarioOptionsGuestsResize; @@ -224,7 +224,7 @@ static rct_window_event_list window_scenario_options_guests_events([](auto& even }); // 0x0097EC40 -static rct_window_event_list window_scenario_options_park_events([](auto& events) +static WindowEventList window_scenario_options_park_events([](auto& events) { events.mouse_up = &WindowEditorScenarioOptionsParkMouseup; events.resize = &WindowEditorScenarioOptionsParkResize; @@ -235,7 +235,7 @@ static rct_window_event_list window_scenario_options_park_events([](auto& events events.paint = &WindowEditorScenarioOptionsParkPaint; }); -static rct_window_event_list *window_editor_scenario_options_page_events[] = { +static WindowEventList *window_editor_scenario_options_page_events[] = { &window_scenario_options_financial_events, &window_scenario_options_guests_events, &window_scenario_options_park_events, diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index 4780fbd79a..a38d7b9e1f 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -31,7 +31,7 @@ static rct_widget window_error_widgets[] = { static void WindowErrorUnknown5(rct_window *w); static void WindowErrorPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_error_events([](auto& events) +static WindowEventList window_error_events([](auto& events) { events.unknown_05 = &WindowErrorUnknown5; events.paint = &WindowErrorPaint; diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 33465de730..e198049866 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -125,7 +125,7 @@ static void WindowFootpathToolup(rct_window * w, WidgetIndex widgetIndex, const static void WindowFootpathInvalidate(rct_window * w); static void WindowFootpathPaint(rct_window * w, rct_drawpixelinfo * dpi); -static rct_window_event_list window_footpath_events([](auto& events) +static WindowEventList window_footpath_events([](auto& events) { events.close = &WindowFootpathClose; events.mouse_up = &WindowFootpathMouseup; diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index b9e2ed6e3a..48c2b5026c 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -87,7 +87,7 @@ static void WindowGameBottomToolbarDrawMiddlePanel(rct_drawpixelinfo *dpi, rct_w * * rct2: 0x0097BFDC */ -static rct_window_event_list window_game_bottom_toolbar_events([](auto& events) +static WindowEventList window_game_bottom_toolbar_events([](auto& events) { events.mouse_up = &WindowGameBottomToolbarMouseup; events.unknown_05 = &WindowGameBottomToolbarUnknown05; diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index ab191e833e..556539953c 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -63,7 +63,7 @@ static void WindowInstallTrackInvalidate(rct_window *w); static void WindowInstallTrackPaint(rct_window *w, rct_drawpixelinfo *dpi); static void WindowInstallTrackTextInput(rct_window *w, WidgetIndex widgetIndex, char *text); -static rct_window_event_list window_install_track_events([](auto& events) +static WindowEventList window_install_track_events([](auto& events) { events.close = &WindowInstallTrackClose; events.mouse_up = &WindowInstallTrackMouseup; diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 5fffdd2282..054c894202 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -93,7 +93,7 @@ static void WindowLoadsaveInvalidate(rct_window *w); static void WindowLoadsavePaint(rct_window *w, rct_drawpixelinfo *dpi); static void WindowLoadsaveScrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int32_t scrollIndex); -static rct_window_event_list window_loadsave_events([](auto& events) +static WindowEventList window_loadsave_events([](auto& events) { events.close = &WindowLoadsaveClose; events.mouse_up = &WindowLoadsaveMouseup; @@ -1140,7 +1140,7 @@ static rct_widget window_overwrite_prompt_widgets[] = { static void WindowOverwritePromptMouseup(rct_window* w, WidgetIndex widgetIndex); static void WindowOverwritePromptPaint(rct_window* w, rct_drawpixelinfo* dpi); -static rct_window_event_list window_overwrite_prompt_events([](auto& events) { +static WindowEventList window_overwrite_prompt_events([](auto& events) { events.mouse_up = &WindowOverwritePromptMouseup; events.paint = &WindowOverwritePromptPaint; }); diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 2f2e375f11..a4b548c61f 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -226,7 +226,7 @@ static void WindowMapgenHeightmapMousedown(rct_window* w, WidgetIndex widgetInde static void WindowMapgenHeightmapInvalidate(rct_window* w); static void WindowMapgenHeightmapPaint(rct_window* w, rct_drawpixelinfo* dpi); -static rct_window_event_list BaseEvents([](auto& events) { +static WindowEventList BaseEvents([](auto& events) { events.close = &WindowMapgenSharedClose; events.mouse_up = &WindowMapgenBaseMouseup; events.mouse_down = &WindowMapgenBaseMousedown; @@ -237,7 +237,7 @@ static rct_window_event_list BaseEvents([](auto& events) { events.paint = &WindowMapgenBasePaint; }); -static rct_window_event_list RandomEvents([](auto& events) { +static WindowEventList RandomEvents([](auto& events) { events.close = &WindowMapgenSharedClose; events.mouse_up = &WindowMapgenRandomMouseup; events.mouse_down = &WindowMapgenRandomMousedown; @@ -246,7 +246,7 @@ static rct_window_event_list RandomEvents([](auto& events) { events.paint = &WindowMapgenRandomPaint; }); -static rct_window_event_list SimplexEvents([](auto& events) { +static WindowEventList SimplexEvents([](auto& events) { events.close = &WindowMapgenSharedClose; events.mouse_up = &WindowMapgenSimplexMouseup; events.mouse_down = &WindowMapgenSimplexMousedown; @@ -257,7 +257,7 @@ static rct_window_event_list SimplexEvents([](auto& events) { events.paint = &WindowMapgenSimplexPaint; }); -static rct_window_event_list HeightmapEvents([](auto& events) { +static WindowEventList HeightmapEvents([](auto& events) { events.close = &WindowMapgenSharedClose; events.mouse_up = &WindowMapgenHeightmapMouseup; events.mouse_down = &WindowMapgenHeightmapMousedown; @@ -265,7 +265,7 @@ static rct_window_event_list HeightmapEvents([](auto& events) { events.paint = &WindowMapgenHeightmapPaint; }); -static rct_window_event_list* PageEvents[] = { +static WindowEventList* PageEvents[] = { &BaseEvents, &RandomEvents, &SimplexEvents, diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index 3b20ded612..68db1c9325 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -26,7 +26,7 @@ static rct_widget window_map_tooltip_widgets[] = { static void WindowMapTooltipUpdate(rct_window *w); static void WindowMapTooltipPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_map_tooltip_events([](auto& events) +static WindowEventList window_map_tooltip_events([](auto& events) { events.update = &WindowMapTooltipUpdate; events.paint = &WindowMapTooltipPaint; diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 0c003a26dd..b9612a607a 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -155,7 +155,7 @@ static void WindowMultiplayerOptionsUpdate(rct_window *w); static void WindowMultiplayerOptionsInvalidate(rct_window *w); static void WindowMultiplayerOptionsPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_multiplayer_information_events([](auto& events) +static WindowEventList window_multiplayer_information_events([](auto& events) { events.mouse_up = &WindowMultiplayerInformationMouseup; events.resize = &WindowMultiplayerInformationResize; @@ -164,7 +164,7 @@ static rct_window_event_list window_multiplayer_information_events([](auto& even events.paint = &WindowMultiplayerInformationPaint; }); -static rct_window_event_list window_multiplayer_players_events([](auto& events) +static WindowEventList window_multiplayer_players_events([](auto& events) { events.mouse_up = &WindowMultiplayerPlayersMouseup; events.resize = &WindowMultiplayerPlayersResize; @@ -177,7 +177,7 @@ static rct_window_event_list window_multiplayer_players_events([](auto& events) events.scroll_paint = &WindowMultiplayerPlayersScrollpaint; }); -static rct_window_event_list window_multiplayer_groups_events([](auto& events) +static WindowEventList window_multiplayer_groups_events([](auto& events) { events.mouse_up = &WindowMultiplayerGroupsMouseup; events.resize = &WindowMultiplayerGroupsResize; @@ -193,7 +193,7 @@ static rct_window_event_list window_multiplayer_groups_events([](auto& events) events.scroll_paint = &WindowMultiplayerGroupsScrollpaint; }); -static rct_window_event_list window_multiplayer_options_events([](auto& events) +static WindowEventList window_multiplayer_options_events([](auto& events) { events.mouse_up = &WindowMultiplayerOptionsMouseup; events.resize = &WindowMultiplayerOptionsResize; @@ -202,7 +202,7 @@ static rct_window_event_list window_multiplayer_options_events([](auto& events) events.paint = &WindowMultiplayerOptionsPaint; }); -static rct_window_event_list *window_multiplayer_page_events[] = { +static WindowEventList *window_multiplayer_page_events[] = { &window_multiplayer_information_events, &window_multiplayer_players_events, &window_multiplayer_groups_events, diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index 97159c10db..e6f2a9cf9f 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -40,7 +40,7 @@ static void WindowNetworkStatusTextinput(rct_window *w, WidgetIndex widgetIndex, static void WindowNetworkStatusInvalidate(rct_window *w); static void WindowNetworkStatusPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_network_status_events([](auto& events) +static WindowEventList window_network_status_events([](auto& events) { events.close = &WindowNetworkStatusOnclose; events.mouse_up = &WindowNetworkStatusMouseup; diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 6edebbffb3..0fbe008df9 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -90,7 +90,7 @@ static void WindowPlayerOverviewUpdate(rct_window* w); static void WindowPlayerOverviewInvalidate(rct_window *w); static void WindowPlayerOverviewPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_player_overview_events([](auto& events) +static WindowEventList window_player_overview_events([](auto& events) { events.close = &WindowPlayerOverviewClose; events.mouse_up = &WindowPlayerOverviewMouseUp; @@ -109,7 +109,7 @@ static void WindowPlayerStatisticsUpdate(rct_window* w); static void WindowPlayerStatisticsInvalidate(rct_window *w); static void WindowPlayerStatisticsPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_player_statistics_events([](auto& events) +static WindowEventList window_player_statistics_events([](auto& events) { events.close = &WindowPlayerStatisticsClose; events.mouse_up = &WindowPlayerStatisticsMouseUp; @@ -119,7 +119,7 @@ static rct_window_event_list window_player_statistics_events([](auto& events) events.paint = &WindowPlayerStatisticsPaint; }); -static rct_window_event_list *window_player_page_events[] = { +static WindowEventList *window_player_page_events[] = { &window_player_overview_events, &window_player_statistics_events, }; diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 0e89aa8265..4aedf58f06 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -113,7 +113,7 @@ static void WindowResearchFundingInvalidate(rct_window *w); static void WindowResearchFundingPaint(rct_window *w, rct_drawpixelinfo *dpi); // -static rct_window_event_list window_research_development_events([](auto& events) +static WindowEventList window_research_development_events([](auto& events) { events.mouse_up = &WindowResearchDevelopmentMouseup; events.update = &WindowResearchDevelopmentUpdate; @@ -122,7 +122,7 @@ static rct_window_event_list window_research_development_events([](auto& events) }); // 0x009890E8 -static rct_window_event_list window_research_funding_events([](auto& events) +static WindowEventList window_research_funding_events([](auto& events) { events.mouse_up = &WindowResearchFundingMouseup; events.mouse_down = &WindowResearchFundingMousedown; @@ -132,7 +132,7 @@ static rct_window_event_list window_research_funding_events([](auto& events) events.paint = &WindowResearchFundingPaint; }); -static rct_window_event_list *window_research_page_events[] = { +static WindowEventList *window_research_page_events[] = { &window_research_development_events, &window_research_funding_events, }; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index ce5ab38b7e..7db4285c49 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -532,7 +532,7 @@ static void WindowRideCustomerPaint(rct_window* w, rct_drawpixelinfo* dpi); static void WindowRideSetPage(rct_window* w, int32_t page); // 0x0098DFD4 -static rct_window_event_list window_ride_main_events([](auto& events) { +static WindowEventList window_ride_main_events([](auto& events) { events.mouse_up = &WindowRideMainMouseup; events.resize = &WindowRideMainResize; events.mouse_down = &WindowRideMainMousedown; @@ -545,7 +545,7 @@ static rct_window_event_list window_ride_main_events([](auto& events) { }); // 0x0098E204 -static rct_window_event_list window_ride_vehicle_events([](auto& events) { +static WindowEventList window_ride_vehicle_events([](auto& events) { events.mouse_up = &WindowRideVehicleMouseup; events.resize = &WindowRideVehicleResize; events.mouse_down = &WindowRideVehicleMousedown; @@ -558,7 +558,7 @@ static rct_window_event_list window_ride_vehicle_events([](auto& events) { }); // 0x0098E0B4 -static rct_window_event_list window_ride_operating_events([](auto& events) { +static WindowEventList window_ride_operating_events([](auto& events) { events.mouse_up = &WindowRideOperatingMouseup; events.resize = &WindowRideOperatingResize; events.mouse_down = &WindowRideOperatingMousedown; @@ -570,7 +570,7 @@ static rct_window_event_list window_ride_operating_events([](auto& events) { }); // 0x0098E124 -static rct_window_event_list window_ride_maintenance_events([](auto& events) { +static WindowEventList window_ride_maintenance_events([](auto& events) { events.mouse_up = &WindowRideMaintenanceMouseup; events.resize = &WindowRideMaintenanceResize; events.mouse_down = &WindowRideMaintenanceMousedown; @@ -581,7 +581,7 @@ static rct_window_event_list window_ride_maintenance_events([](auto& events) { }); // 0x0098E044 -static rct_window_event_list window_ride_colour_events([](auto& events) { +static WindowEventList window_ride_colour_events([](auto& events) { events.close = &WindowRideColourClose; events.mouse_up = &WindowRideColourMouseup; events.resize = &WindowRideColourResize; @@ -596,7 +596,7 @@ static rct_window_event_list window_ride_colour_events([](auto& events) { }); // 0x0098E194 -static rct_window_event_list window_ride_music_events([](auto& events) { +static WindowEventList window_ride_music_events([](auto& events) { events.mouse_up = &WindowRideMusicMouseup; events.resize = &WindowRideMusicResize; events.mouse_down = &WindowRideMusicMousedown; @@ -607,7 +607,7 @@ static rct_window_event_list window_ride_music_events([](auto& events) { }); // 0x0098DE14 -static rct_window_event_list window_ride_measurements_events([](auto& events) { +static WindowEventList window_ride_measurements_events([](auto& events) { events.close = &WindowRideMeasurementsClose; events.mouse_up = &WindowRideMeasurementsMouseup; events.resize = &WindowRideMeasurementsResize; @@ -622,7 +622,7 @@ static rct_window_event_list window_ride_measurements_events([](auto& events) { }); // 0x0098DF64 -static rct_window_event_list window_ride_graphs_events([](auto& events) { +static WindowEventList window_ride_graphs_events([](auto& events) { events.mouse_up = &WindowRideGraphsMouseup; events.resize = &WindowRideGraphsResize; events.mouse_down = &WindowRideGraphsMousedown; @@ -636,7 +636,7 @@ static rct_window_event_list window_ride_graphs_events([](auto& events) { }); // 0x0098DEF4 -static rct_window_event_list window_ride_income_events([](auto& events) { +static WindowEventList window_ride_income_events([](auto& events) { events.mouse_up = &WindowRideIncomeMouseup; events.resize = &WindowRideIncomeResize; events.mouse_down = &WindowRideIncomeMousedown; @@ -647,7 +647,7 @@ static rct_window_event_list window_ride_income_events([](auto& events) { }); // 0x0098DE84 -static rct_window_event_list window_ride_customer_events([](auto& events) { +static WindowEventList window_ride_customer_events([](auto& events) { events.mouse_up = &WindowRideCustomerMouseup; events.resize = &WindowRideCustomerResize; events.update = &WindowRideCustomerUpdate; @@ -656,7 +656,7 @@ static rct_window_event_list window_ride_customer_events([](auto& events) { }); // clang-format off -static rct_window_event_list *window_ride_page_events[] = { +static WindowEventList *window_ride_page_events[] = { &window_ride_main_events, &window_ride_vehicle_events, &window_ride_operating_events, diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index cdc8664967..508b79cfe5 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -72,7 +72,7 @@ static void WindowSavePromptMouseup(rct_window *w, WidgetIndex widgetIndex); static void WindowSavePromptPaint(rct_window *w, rct_drawpixelinfo *dpi); static void WindowSavePromptCallback(int32_t result, const utf8 * path); -static rct_window_event_list window_save_prompt_events([](auto& events) +static WindowEventList window_save_prompt_events([](auto& events) { events.close = &WindowSavePromptClose; events.mouse_up = &WindowSavePromptMouseup; diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index 873eeb9c9a..1613e029ef 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -118,7 +118,7 @@ static bool ScenarioSelectUseSmallFont() return ThemeGetFlags() & UITHEME_FLAG_USE_ALTERNATIVE_SCENARIO_SELECT_FONT; } -static rct_window_event_list window_scenarioselect_events([](auto& events) +static WindowEventList window_scenarioselect_events([](auto& events) { events.close = &WindowScenarioselectClose; events.mouse_up = &WindowScenarioselectMouseup; diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 9f577e0d9a..711b3180c2 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -87,7 +87,7 @@ static void WindowServerListInvalidate(rct_window* w); static void WindowServerListPaint(rct_window* w, rct_drawpixelinfo* dpi); static void WindowServerListScrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t scrollIndex); -static rct_window_event_list window_server_list_events([](auto& events) { +static WindowEventList window_server_list_events([](auto& events) { events.close = &WindowServerListClose; events.mouse_up = &WindowServerListMouseup; events.resize = &WindowServerListResize; diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index f586d2fc92..bf49a0276b 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -43,7 +43,7 @@ static void WindowStaffFireMouseup(rct_window *w, WidgetIndex widgetIndex); static void WindowStaffFirePaint(rct_window *w, rct_drawpixelinfo *dpi); //0x9A3F7C -static rct_window_event_list window_staff_fire_events([](auto& events) +static WindowEventList window_staff_fire_events([](auto& events) { events.mouse_up = &WindowStaffFireMouseup; events.paint = &WindowStaffFirePaint; diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 212bfc341c..c0dd6a4fbc 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -465,7 +465,7 @@ static void WindowTileInspectorScrollpaint(rct_window* w, rct_drawpixelinfo* dpi static void WindowTileInspectorSetPage(rct_window* w, const TileInspectorPage page); static void WindowTileInspectorClose(rct_window* w); -static rct_window_event_list TileInspectorWindowEvents([](auto& events) { +static WindowEventList TileInspectorWindowEvents([](auto& events) { events.mouse_up = &WindowTileInspectorMouseup; events.resize = &WindowTileInspectorResize; events.mouse_down = &WindowTileInspectorMousedown; diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index dce7203dcc..0acc052e98 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -28,7 +28,7 @@ static rct_widget window_title_exit_widgets[] = { static void WindowTitleExitPaint(rct_window *w, rct_drawpixelinfo *dpi); static void WindowTitleExitMouseup(rct_window *w, WidgetIndex widgetIndex); -static rct_window_event_list window_title_exit_events([](auto& events) +static WindowEventList window_title_exit_events([](auto& events) { events.mouse_up = &WindowTitleExitMouseup; events.paint = &WindowTitleExitPaint; diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index 61d124de4f..e7c5eca0c6 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -31,7 +31,7 @@ static void WindowTitleMenuMouseup(rct_window* w, WidgetIndex widgetIndex); static void WindowTitleLogoPaint(rct_window* w, rct_drawpixelinfo* dpi); // clang-format off -static rct_window_event_list window_title_logo_events([](auto& events) +static WindowEventList window_title_logo_events([](auto& events) { events.mouse_up = &WindowTitleMenuMouseup; events.paint = &WindowTitleLogoPaint; diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index 0994888645..6df8dd6f3e 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -62,7 +62,7 @@ static void WindowTitleMenuCursor(rct_window *w, WidgetIndex widgetIndex, const static void WindowTitleMenuInvalidate(rct_window *w); static void WindowTitleMenuPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_title_menu_events([](auto& events) +static WindowEventList window_title_menu_events([](auto& events) { events.mouse_up = &WindowTitleMenuMouseup; events.mouse_down = &WindowTitleMenuMousedown; diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index e969506edb..8a5294acb6 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -27,7 +27,7 @@ static rct_widget window_title_options_widgets[] = { static void WindowTitleOptionsMouseup(rct_window *w, WidgetIndex widgetIndex); static void WindowTitleOptionsPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_title_options_events([](auto& events) +static WindowEventList window_title_options_events([](auto& events) { events.mouse_up = &WindowTitleOptionsMouseup; events.paint = &WindowTitleOptionsPaint; diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index 19a802ddee..9956590cce 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -29,7 +29,7 @@ static rct_widget window_tooltip_widgets[] = { static void WindowTooltipUpdate(rct_window *w); static void WindowTooltipPaint(rct_window *w, rct_drawpixelinfo *dpi); -static rct_window_event_list window_tooltip_events([](auto& events) +static WindowEventList window_tooltip_events([](auto& events) { events.update = &WindowTooltipUpdate; events.paint = &WindowTooltipPaint; diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 71c30b2c11..40ca5db9b6 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -289,7 +289,7 @@ static void WindowTopToolbarToolAbort(rct_window* w, WidgetIndex widgetIndex); static void WindowTopToolbarInvalidate(rct_window* w); static void WindowTopToolbarPaint(rct_window* w, rct_drawpixelinfo* dpi); -static rct_window_event_list window_top_toolbar_events([](auto& events) { +static WindowEventList window_top_toolbar_events([](auto& events) { events.mouse_up = &WindowTopToolbarMouseup; events.mouse_down = &WindowTopToolbarMousedown; events.dropdown = &WindowTopToolbarDropdown; diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 40a47611f9..6db758eae9 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -65,7 +65,7 @@ static void WindowTrackDeletePromptMouseup(rct_window *w, WidgetIndex widgetInde static void WindowTrackDeletePromptPaint(rct_window *w, rct_drawpixelinfo *dpi); // 0x009940EC -static rct_window_event_list window_track_manage_events([](auto& events) +static WindowEventList window_track_manage_events([](auto& events) { events.close = &WindowTrackManageClose; events.mouse_up = &WindowTrackManageMouseup; @@ -74,7 +74,7 @@ static rct_window_event_list window_track_manage_events([](auto& events) }); // 0x0099415C -static rct_window_event_list window_track_delete_prompt_events([](auto& events) +static WindowEventList window_track_delete_prompt_events([](auto& events) { events.mouse_up = &WindowTrackDeletePromptMouseup; events.paint = &WindowTrackDeletePromptPaint; diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index cd4032c66e..0e238148a9 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -220,7 +220,7 @@ struct Focus } }; -struct rct_window_event_list +struct WindowEventList { void (*close)(struct rct_window*){}; void (*mouse_up)(struct rct_window*, WidgetIndex){}; @@ -249,8 +249,8 @@ struct rct_window_event_list void (*paint)(struct rct_window*, rct_drawpixelinfo*){}; void (*scroll_paint)(struct rct_window*, rct_drawpixelinfo*, int32_t){}; - typedef void (*fnEventInitializer)(rct_window_event_list&); - rct_window_event_list(fnEventInitializer fn) + typedef void (*fnEventInitializer)(WindowEventList&); + WindowEventList(fnEventInitializer fn) { fn(*this); } @@ -593,12 +593,11 @@ T* WindowFocusOrCreate(WindowClass cls, int32_t width, int32_t height, uint32_t } rct_window* WindowCreate( - const ScreenCoordsXY& pos, int32_t width, int32_t height, rct_window_event_list* event_handlers, WindowClass cls, - uint32_t flags); + const ScreenCoordsXY& pos, int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags); rct_window* WindowCreateAutoPos( - int32_t width, int32_t height, rct_window_event_list* event_handlers, WindowClass cls, uint32_t flags); + int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags); rct_window* WindowCreateCentred( - int32_t width, int32_t height, rct_window_event_list* event_handlers, WindowClass cls, uint32_t flags); + int32_t width, int32_t height, WindowEventList* event_handlers, WindowClass cls, uint32_t flags); void window_close(rct_window& window); void window_close_by_class(WindowClass cls); diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h index 2c6017451a..c826d940ac 100644 --- a/src/openrct2/interface/Window_internal.h +++ b/src/openrct2/interface/Window_internal.h @@ -31,7 +31,7 @@ struct rct_object_entry; */ struct rct_window { - rct_window_event_list* event_handlers{}; + WindowEventList* event_handlers{}; rct_viewport* viewport{}; uint64_t disabled_widgets{}; uint64_t pressed_widgets{};