libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Rename menu_input_frame to menu_input_frame_retropad

Browse Source
This commit is contained in:
twinaphex 2015-10-23 09:01:57 +02:00
parent 6ac88eed54
commit 8c74be0879
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_input.c
View File

@ -1206,7 +1206,7 @@ void menu_input_post_iterate(int *ret, unsigned action)
*ret |= menu_input_pointer_post_iterate(cbs, &entry, action);
}
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input, retro_input_t *devices)
unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_input, retro_input_t *devices)
{
bool mouse_enabled;
float delta_time;

2
menu/menu_input.h
View File

@ -118,7 +118,7 @@ void menu_input_st_string_callback(void *userdata, const char *str);
void menu_input_st_cheat_callback(void *userdata, const char *str);
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_state, retro_input_t *devices_mask);
unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state, retro_input_t *devices_mask);
void menu_input_post_iterate(int *ret, unsigned action);

2
runloop.c
View File

@ -981,7 +981,7 @@ int rarch_main_iterate(unsigned *sleep_ms)
#ifdef HAVE_MENU
if (menu_driver_alive())
{
if (menu_driver_iterate((enum menu_action)menu_input_frame(input, trigger_input, &devices)) == -1)
if (menu_driver_iterate((enum menu_action)menu_input_frame_retropad(input, trigger_input, &devices)) == -1)
rarch_ctl(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, NULL);
if (!input && settings->menu.pause_libretro)