From 27f5773e4d24a2a7c12830a474ec67f3d1275476 Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Mon, 26 Jun 2017 03:56:41 -0400 Subject: [PATCH] rename event unknown_14 to viewport_rotate --- src/openrct2/interface/window.c | 12 ++++++------ src/openrct2/interface/window.h | 6 +++--- src/openrct2/windows/banner.c | 6 +++--- src/openrct2/windows/guest.c | 6 +++--- src/openrct2/windows/ride.c | 6 +++--- src/openrct2/windows/sign.c | 8 ++++---- src/openrct2/windows/staff.c | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index a5e5bbe152..4846963acf 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -1416,12 +1416,12 @@ void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z) * * rct2: 0x00688956 */ -static void call_event_unknown_14_on_all_windows() +static void call_event_viewport_rotate_on_all_windows() { rct_window *w; for (w = RCT2_NEW_WINDOW - 1; w >= g_window_list; w--) - window_event_unknown_14_call(w); + window_event_viewport_rotate_call(w); } /** @@ -1469,7 +1469,7 @@ void window_rotate_camera(rct_window *w, sint32 direction) window_invalidate(w); - call_event_unknown_14_on_all_windows(); + call_event_viewport_rotate_on_all_windows(); reset_all_sprite_quadrant_placements(); } @@ -2032,10 +2032,10 @@ void window_event_textinput_call(rct_window *w, rct_widgetindex widgetIndex, cha w->event_handlers->text_input(w, widgetIndex, text); } -void window_event_unknown_14_call(rct_window *w) +void window_event_viewport_rotate_call(rct_window *w) { - if (w->event_handlers->unknown_14 != NULL) - w->event_handlers->unknown_14(w); + if (w->event_handlers->viewport_rotate != NULL) + w->event_handlers->viewport_rotate(w); } void window_event_unknown_15_call(rct_window *w, sint32 scrollIndex, sint32 scrollAreaType) diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 7e3d81af0b..5c38425e14 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -172,7 +172,7 @@ typedef struct rct_window_event_list { void (*scroll_mousedrag)(struct rct_window*, sint32, sint32, sint32); void (*scroll_mouseover)(struct rct_window*, sint32, sint32, sint32); void (*text_input)(struct rct_window*, rct_widgetindex, char*); - void (*unknown_14)(struct rct_window*); + void (*viewport_rotate)(struct rct_window*); void (*unknown_15)(struct rct_window*, sint32, sint32); void (*tooltip)(struct rct_window*, rct_widgetindex, rct_string_id*); void (*cursor)(struct rct_window*, rct_widgetindex, sint32, sint32, sint32*); @@ -340,7 +340,7 @@ typedef enum { WE_SCROLL_MOUSEDRAG = 17, WE_SCROLL_MOUSEOVER = 18, WE_TEXT_INPUT = 19, - WE_UNKNOWN_14 = 20, + WE_VIEWPORT_ROTATE = 20, WE_UNKNOWN_15 = 21, // scroll mouse move? WE_TOOLTIP = 22, WE_CURSOR = 23, @@ -814,7 +814,7 @@ void window_event_scroll_mousedown_call(rct_window* w, sint32 scrollIndex, sint3 void window_event_scroll_mousedrag_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y); void window_event_scroll_mouseover_call(rct_window* w, sint32 scrollIndex, sint32 x, sint32 y); void window_event_textinput_call(rct_window *w, rct_widgetindex widgetIndex, char *text); -void window_event_unknown_14_call(rct_window* w); +void window_event_viewport_rotate_call(rct_window* w); void window_event_unknown_15_call(rct_window* w, sint32 scrollIndex, sint32 scrollAreaType); rct_string_id window_event_tooltip_call(rct_window* w, rct_widgetindex widgetIndex); sint32 window_event_cursor_call(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y); diff --git a/src/openrct2/windows/banner.c b/src/openrct2/windows/banner.c index b7309f6ab7..3500e4e017 100644 --- a/src/openrct2/windows/banner.c +++ b/src/openrct2/windows/banner.c @@ -79,7 +79,7 @@ static void window_banner_mouseup(rct_window *w, rct_widgetindex widgetIndex); static void window_banner_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget); static void window_banner_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex); static void window_banner_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text); -static void window_banner_unknown_14(rct_window *w); +static void window_banner_viewport_rotate(rct_window *w); static void window_banner_invalidate(rct_window *w); static void window_banner_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -104,7 +104,7 @@ static rct_window_event_list window_banner_events = { NULL, NULL, window_banner_textinput, - window_banner_unknown_14, + window_banner_viewport_rotate, NULL, NULL, NULL, @@ -343,7 +343,7 @@ static void window_banner_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x6BA7B5 */ -static void window_banner_unknown_14(rct_window *w) +static void window_banner_viewport_rotate(rct_window *w) { rct_viewport* view = w->viewport; w->viewport = 0; diff --git a/src/openrct2/windows/guest.c b/src/openrct2/windows/guest.c index 72fc5d099d..37afa3edd9 100644 --- a/src/openrct2/windows/guest.c +++ b/src/openrct2/windows/guest.c @@ -181,7 +181,7 @@ void window_guest_overview_resize(rct_window *w); void window_guest_overview_mouse_up(rct_window *w, rct_widgetindex widgetIndex); void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi); void window_guest_overview_invalidate(rct_window *w); -void window_guest_overview_unknown_14(rct_window *w); +void window_guest_overview_viewport_rotate(rct_window *w); void window_guest_overview_update(rct_window* w); void window_guest_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text); void window_guest_overview_tool_update(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y); @@ -242,7 +242,7 @@ static rct_window_event_list window_guest_overview_events = { NULL, NULL, window_guest_overview_text_input, - window_guest_overview_unknown_14, + window_guest_overview_viewport_rotate, NULL, NULL, NULL, @@ -697,7 +697,7 @@ void window_guest_set_page(rct_window* w, sint32 page){ if (listen && w->viewport) w->viewport->flags |= VIEWPORT_FLAG_SOUND_ON; } -void window_guest_overview_unknown_14(rct_window *w) +void window_guest_overview_viewport_rotate(rct_window *w) { window_guest_viewport_init(w); } diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c index 8b61b0017c..a4862a3765 100644 --- a/src/openrct2/windows/ride.c +++ b/src/openrct2/windows/ride.c @@ -529,7 +529,7 @@ static void window_ride_main_mousedown(rct_widgetindex widgetIndex, rct_window * static void window_ride_main_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex); static void window_ride_main_update(rct_window *w); static void window_ride_main_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text); -static void window_ride_main_unknown_14(rct_window *w); +static void window_ride_main_viewport_rotate(rct_window *w); static void window_ride_main_invalidate(rct_window *w); static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -639,7 +639,7 @@ static rct_window_event_list window_ride_main_events = { NULL, NULL, window_ride_main_textinput, - window_ride_main_unknown_14, + window_ride_main_viewport_rotate, NULL, NULL, NULL, @@ -2275,7 +2275,7 @@ static void window_ride_main_textinput(rct_window *w, rct_widgetindex widgetInde * * rct2: 0x006AF55A */ -static void window_ride_main_unknown_14(rct_window *w) +static void window_ride_main_viewport_rotate(rct_window *w) { window_ride_init_viewport(w); } diff --git a/src/openrct2/windows/sign.c b/src/openrct2/windows/sign.c index 69e9a6a21e..1a974c9f7d 100644 --- a/src/openrct2/windows/sign.c +++ b/src/openrct2/windows/sign.c @@ -60,7 +60,7 @@ static void window_sign_mouseup(rct_window *w, rct_widgetindex widgetIndex); static void window_sign_mousedown(rct_widgetindex widgetIndex, rct_window*w, rct_widget* widget); static void window_sign_dropdown(rct_window *w, rct_widgetindex widgetIndex, sint32 dropdownIndex); static void window_sign_textinput(rct_window *w, rct_widgetindex widgetIndex, char *text); -static void window_sign_unknown_14(rct_window *w); +static void window_sign_viewport_rotate(rct_window *w); static void window_sign_invalidate(rct_window *w); static void window_sign_paint(rct_window *w, rct_drawpixelinfo *dpi); @@ -87,7 +87,7 @@ static rct_window_event_list window_sign_events = { NULL, NULL, window_sign_textinput, - window_sign_unknown_14, + window_sign_viewport_rotate, NULL, NULL, NULL, @@ -123,7 +123,7 @@ static rct_window_event_list window_sign_small_events = { NULL, NULL, window_sign_textinput, - window_sign_unknown_14, + window_sign_viewport_rotate, NULL, NULL, NULL, @@ -361,7 +361,7 @@ static void window_sign_paint(rct_window *w, rct_drawpixelinfo *dpi) * * rct2: 0x6B9A6C, 0x6E6424 */ -static void window_sign_unknown_14(rct_window *w) +static void window_sign_viewport_rotate(rct_window *w) { rct_viewport* view = w->viewport; w->viewport = 0; diff --git a/src/openrct2/windows/staff.c b/src/openrct2/windows/staff.c index d8bb201b57..d3944586df 100644 --- a/src/openrct2/windows/staff.c +++ b/src/openrct2/windows/staff.c @@ -142,7 +142,7 @@ void window_staff_overview_tool_update(rct_window* w, rct_widgetindex widgetInde void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, sint32 x, sint32 y); void window_staff_overview_tool_abort(rct_window *w, rct_widgetindex widgetIndex); void window_staff_overview_text_input(rct_window *w, rct_widgetindex widgetIndex, char *text); -void window_staff_overview_unknown_14(rct_window *w); +void window_staff_overview_viewport_rotate(rct_window *w); void window_staff_options_mouseup(rct_window *w, rct_widgetindex widgetIndex); void window_staff_options_update(rct_window* w); @@ -183,7 +183,7 @@ static rct_window_event_list window_staff_overview_events = { NULL, NULL, window_staff_overview_text_input, - window_staff_overview_unknown_14, + window_staff_overview_viewport_rotate, NULL, NULL, NULL, @@ -1201,7 +1201,7 @@ void window_staff_overview_text_input(rct_window *w, rct_widgetindex widgetIndex * * rct2: 0x006BE5FC */ -void window_staff_overview_unknown_14(rct_window *w) +void window_staff_overview_viewport_rotate(rct_window *w) { window_staff_viewport_init(w); }