mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-08-21 03:58:35 +02:00
parent c05bb6e0c3
commit c222b20ec1
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/menu.c
View File

@ -348,18 +348,9 @@ void menu_free(menu_handle_t *menu)
int menu_iterate(retro_input_t input,
retro_input_t old_input, retro_input_t trigger_input)
{
unsigned action = 0;
menu_display_t *disp = menu_display_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr();
menu_animation_update_time(disp->animation);
menu_input->joypad.state = menu_input_frame(input, trigger_input);
action = menu_input->joypad.state;
if (menu_iterate_main(action))
return -1;
return 0;
return menu_iterate_main(menu_input_frame(input, trigger_input));
}

5
menu/menu_input.h
View File

@ -113,11 +113,6 @@ typedef struct menu_input
{
struct menu_bind_state binds;
struct
{
unsigned state;
} joypad;
struct
{
int16_t dx;

7
menu/menu_iterate.c
View File

@ -491,7 +491,7 @@ int menu_iterate_main(unsigned action)
ret = menu_entry_action(&entry, selected, (enum menu_action)action);
if (ret)
return ret;
goto end;
menu->state.do_post_iterate = true;
menu->state.do_render = true;
@ -517,7 +517,10 @@ int menu_iterate_main(unsigned action)
if (menu->state.do_post_iterate)
menu_input_post_iterate(&ret, action);
return ret;
end:
if (ret)
return -1;
return 0;
}
int menu_iterate_main_render(void)