Change signature of menu_input_frame

This commit is contained in:
twinaphex 2015-09-27 22:47:34 +02:00
parent ac6976074c
commit c982e1d6eb
2 changed files with 5 additions and 5 deletions

View File

@ -1204,10 +1204,10 @@ void menu_input_post_iterate(int *ret, unsigned action)
*ret |= menu_input_pointer_post_iterate(cbs, &entry, action); *ret |= menu_input_pointer_post_iterate(cbs, &entry, action);
} }
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) enum menu_action menu_input_frame(retro_input_t input, retro_input_t trigger_input)
{ {
float delta_time; float delta_time;
unsigned ret = MENU_ACTION_NOOP; enum menu_action ret = MENU_ACTION_NOOP;
static bool initial_held = true; static bool initial_held = true;
static bool first_held = false; static bool first_held = false;
static const retro_input_t input_repeat = static const retro_input_t input_repeat =

View File

@ -25,7 +25,7 @@
extern "C" { extern "C" {
#endif #endif
typedef enum menu_action enum menu_action
{ {
MENU_ACTION_UP, MENU_ACTION_UP,
MENU_ACTION_DOWN, MENU_ACTION_DOWN,
@ -42,7 +42,7 @@ typedef enum menu_action
MENU_ACTION_SCROLL_UP, MENU_ACTION_SCROLL_UP,
MENU_ACTION_TOGGLE, MENU_ACTION_TOGGLE,
MENU_ACTION_NOOP MENU_ACTION_NOOP
} menu_action_t; };
enum menu_input_pointer_state enum menu_input_pointer_state
{ {
@ -107,7 +107,7 @@ void menu_input_st_cheat_callback(void *userdata, const char *str);
int menu_input_bind_iterate(char *s, size_t len); int menu_input_bind_iterate(char *s, size_t len);
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_state); enum menu_action menu_input_frame(retro_input_t input, retro_input_t trigger_state);
void menu_input_post_iterate(int *ret, unsigned action); void menu_input_post_iterate(int *ret, unsigned action);