From ae8b2b837408e45937d2187fe25f433bf2a5c39c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 27 Aug 2022 16:50:02 +0200 Subject: [PATCH] Remove unused window events --- src/openrct2-ui/input/MouseInput.cpp | 2 -- src/openrct2/interface/Window.cpp | 14 -------------- src/openrct2/interface/Window.h | 4 ---- 3 files changed, 20 deletions(-) diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 3999c4860c..457a92327d 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -129,8 +129,6 @@ void GameHandleInput() ProcessMouseOver(screenCoords); ProcessMouseTool(screenCoords); } - - window_visit_each([](rct_window* w) { window_event_unknown_08_call(w); }); } /** diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 5845500663..d363138632 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -1470,13 +1470,6 @@ void window_event_periodic_update_call(rct_window* w) w->event_handlers->periodic_update(w); } -void window_event_unknown_08_call(rct_window* w) -{ - if (w->event_handlers != nullptr) - if (w->event_handlers->unknown_08 != nullptr) - w->event_handlers->unknown_08(w); -} - void window_event_tool_update_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords) { if (w->event_handlers == nullptr) @@ -1517,13 +1510,6 @@ void window_event_tool_abort_call(rct_window* w, WidgetIndex widgetIndex) w->event_handlers->tool_abort(w, widgetIndex); } -void window_event_unknown_0E_call(rct_window* w) -{ - if (w->event_handlers != nullptr) - if (w->event_handlers->unknown_0E != nullptr) - w->event_handlers->unknown_0E(w); -} - void window_get_scroll_size(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height) { if (w->event_handlers == nullptr) diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 3b57e45a32..cd4032c66e 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -230,13 +230,11 @@ struct rct_window_event_list void (*unknown_05)(struct rct_window*){}; void (*update)(struct rct_window*){}; void (*periodic_update)(struct rct_window*){}; - void (*unknown_08)(struct rct_window*){}; void (*tool_update)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){}; void (*tool_down)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){}; void (*tool_drag)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){}; void (*tool_up)(struct rct_window*, WidgetIndex, const ScreenCoordsXY&){}; void (*tool_abort)(struct rct_window*, WidgetIndex){}; - void (*unknown_0E)(struct rct_window*){}; void (*get_scroll_size)(struct rct_window*, int32_t, int32_t*, int32_t*){}; void (*scroll_mousedown)(struct rct_window*, int32_t, const ScreenCoordsXY&){}; void (*scroll_mousedrag)(struct rct_window*, int32_t, const ScreenCoordsXY&){}; @@ -677,13 +675,11 @@ void window_event_dropdown_call(rct_window* w, WidgetIndex widgetIndex, int32_t void window_event_unknown_05_call(rct_window* w); void window_event_update_call(rct_window* w); void window_event_periodic_update_call(rct_window* w); -void window_event_unknown_08_call(rct_window* w); void window_event_tool_update_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords); void window_event_tool_down_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords); void window_event_tool_drag_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords); void window_event_tool_up_call(rct_window* w, WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords); void window_event_tool_abort_call(rct_window* w, WidgetIndex widgetIndex); -void window_event_unknown_0E_call(rct_window* w); void window_get_scroll_size(rct_window* w, int32_t scrollIndex, int32_t* width, int32_t* height); void window_event_scroll_mousedown_call(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords); void window_event_scroll_mousedrag_call(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords);