ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add iCade code to cocoa_input_is_pressed" 

This reverts commit 536754d6f2.
This commit is contained in:
Twinaphex 2015-11-13 02:46:01 +01:00
parent 536754d6f2
commit 8ebad97fbd
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
input/drivers/cocoa_input.c
View File

@ -222,23 +222,11 @@ int32_t cocoa_input_find_any_axis(uint32_t port)
static int16_t cocoa_input_is_pressed(cocoa_input_data_t *apple, unsigned port_num, static int16_t cocoa_input_is_pressed(cocoa_input_data_t *apple, unsigned port_num,
const struct retro_keybind *binds, unsigned id) const struct retro_keybind *binds, unsigned id)
{ {
#if TARGET_OS_IPHONE
settings_t *settings = config_get_ptr();
#endif
if (id < RARCH_BIND_LIST_END) if (id < RARCH_BIND_LIST_END)
{ {
const struct retro_keybind *bind = &binds[id]; const struct retro_keybind *bind = &binds[id];
unsigned bit = input_keymaps_translate_rk_to_keysym(bind->key); unsigned bit = input_keymaps_translate_rk_to_keysym(bind->key);
if (!bind->valid) return bind->valid && apple->key_state[bit];
return 0;
if (apple->key_state[bit])
return 1;
#if TARGET_OS_IPHONE
if (settings->input.icade_enable)
if (apple->icade_buttons & (1 << bit))
return 1;
#endif
} }
return 0; return 0;
} }