diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 6563387b7a..316645ccbb 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -109,7 +109,7 @@ void game_handle_input() for (size_t i = g_window_list.size(); i > 0; i--) { auto& w = g_window_list[i - 1]; - window_event_unknown_07_call(w.get()); + window_event_periodic_update_call(w.get()); } invalidate_all_windows_after_input(); diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 1ad384a2d4..d20843848e 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -62,7 +62,7 @@ static void window_scenery_resize(rct_window *w); static void window_scenery_mousedown(rct_window *w, rct_widgetindex widgetIndex, rct_widget* widget); static void window_scenery_dropdown(rct_window *w, rct_widgetindex widgetIndex, int32_t dropdownIndex); static void window_scenery_update(rct_window *w); -static void window_scenery_event_07(rct_window *w); +static void window_scenery_periodic_update(rct_window *w); static void window_scenery_scrollgetsize(rct_window *w, int32_t scrollIndex, int32_t *width, int32_t *height); static void window_scenery_scrollmousedown(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y); static void window_scenery_scrollmouseover(rct_window *w, int32_t scrollIndex, int32_t x, int32_t y); @@ -79,7 +79,7 @@ static rct_window_event_list window_scenery_events = { window_scenery_dropdown, nullptr, window_scenery_update, - window_scenery_event_07, + window_scenery_periodic_update, nullptr, nullptr, nullptr, @@ -731,7 +731,7 @@ static void window_scenery_dropdown(rct_window* w, rct_widgetindex widgetIndex, * * rct2: 0x006E1B9F */ -static void window_scenery_event_07(rct_window* w) +static void window_scenery_periodic_update(rct_window* w) { if (w->scenery.selected_scenery_id != WINDOW_SCENERY_TAB_SELECTION_UNDEFINED) { diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index c2d5cbf2cf..6ac78dcec5 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -49,7 +49,7 @@ static rct_widget window_text_input_widgets[] = { static void window_text_input_close(rct_window *w); static void window_text_input_mouseup(rct_window *w, rct_widgetindex widgetIndex); -static void window_text_input_update7(rct_window *w); +static void window_text_input_periodic_update(rct_window *w); static void window_text_input_invalidate(rct_window *w); static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi); static void draw_ime_composition(rct_drawpixelinfo * dpi, int cursorX, int cursorY); @@ -63,7 +63,7 @@ static rct_window_event_list window_text_input_events = { nullptr, nullptr, nullptr, - window_text_input_update7, + window_text_input_periodic_update, nullptr, nullptr, nullptr, @@ -301,7 +301,7 @@ void window_text_input_key(rct_window* w, char keychar) window_invalidate(w); } -void window_text_input_update7(rct_window* w) +void window_text_input_periodic_update(rct_window* w) { rct_window* calling_w = window_find_by_number(calling_class, calling_number); // If the calling window is closed then close the text @@ -316,6 +316,7 @@ void window_text_input_update7(rct_window* w) w->frame_no++; if (w->frame_no > 30) w->frame_no = 0; + window_invalidate(w); } diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index e18b03ebe6..f594809355 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -140,7 +140,7 @@ void window_update_all() for (auto it = g_window_list.rbegin(); it != g_window_list.rend(); it++) { auto w = it->get(); - window_event_unknown_07_call(w); + window_event_periodic_update_call(w); } } @@ -1468,10 +1468,10 @@ void window_event_update_call(rct_window* w) w->event_handlers->update(w); } -void window_event_unknown_07_call(rct_window* w) +void window_event_periodic_update_call(rct_window* w) { - if (w->event_handlers->unknown_07 != nullptr) - w->event_handlers->unknown_07(w); + if (w->event_handlers->periodic_update != nullptr) + w->event_handlers->periodic_update(w); } void window_event_unknown_08_call(rct_window* w) diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h index 1f18191a4b..fe39cd4896 100644 --- a/src/openrct2/interface/Window.h +++ b/src/openrct2/interface/Window.h @@ -164,7 +164,7 @@ struct rct_window_event_list void (*dropdown)(struct rct_window*, rct_widgetindex, int32_t); void (*unknown_05)(struct rct_window*); void (*update)(struct rct_window*); - void (*unknown_07)(struct rct_window*); + void (*periodic_update)(struct rct_window*); void (*unknown_08)(struct rct_window*); void (*tool_update)(struct rct_window*, rct_widgetindex, int32_t, int32_t); void (*tool_down)(struct rct_window*, rct_widgetindex, int32_t, int32_t); @@ -674,7 +674,7 @@ void window_event_mouse_down_call(rct_window* w, rct_widgetindex widgetIndex); void window_event_dropdown_call(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex); void window_event_unknown_05_call(rct_window* w); void window_event_update_call(rct_window* w); -void window_event_unknown_07_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, rct_widgetindex widgetIndex, int32_t x, int32_t y); void window_event_tool_down_call(rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y);