Get rid of menu_input_reset

This commit is contained in:
twinaphex 2021-03-20 14:05:48 +01:00
parent be00c9fd5f
commit 9fd88744ff

View File

@ -3805,7 +3805,8 @@ static bool menu_init(
/* Ensure that menu pointer input is correctly /* Ensure that menu pointer input is correctly
* initialised */ * initialised */
menu_input_reset(menu_input, pointer_hw_state); memset(menu_input, 0, sizeof(menu_input_t));
memset(pointer_hw_state, 0, sizeof(menu_input_pointer_hw_state_t));
if (!menu_entries_init(menu_st, menu_driver_ctx)) if (!menu_entries_init(menu_st, menu_driver_ctx))
{ {
@ -5140,10 +5141,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
for (i = 0; i < SCROLL_INDEX_SIZE; i++) for (i = 0; i < SCROLL_INDEX_SIZE; i++)
menu_st->scroll.index_list[i] = 0; menu_st->scroll.index_list[i] = 0;
menu_input_reset( memset(&p_rarch->menu_input_state, 0, sizeof(menu_input_t));
&p_rarch->menu_input_state, memset(&p_rarch->menu_input_pointer_hw_state, 0, sizeof(menu_input_pointer_hw_state_t));
&p_rarch->menu_input_pointer_hw_state
);
if ( p_rarch->menu_driver_ctx if ( p_rarch->menu_driver_ctx
&& p_rarch->menu_driver_ctx->free) && p_rarch->menu_driver_ctx->free)
@ -23917,15 +23916,6 @@ void menu_input_set_pointer_y_accel(float y_accel)
menu_input->pointer.y_accel = y_accel; menu_input->pointer.y_accel = y_accel;
} }
static void menu_input_reset(
menu_input_t *menu_input,
menu_input_pointer_hw_state_t *pointer_hw_state
)
{
memset(menu_input, 0, sizeof(menu_input_t));
memset(pointer_hw_state, 0, sizeof(menu_input_pointer_hw_state_t));
}
static float menu_input_get_dpi(struct rarch_state *p_rarch) static float menu_input_get_dpi(struct rarch_state *p_rarch)
{ {
static unsigned last_video_width = 0; static unsigned last_video_width = 0;