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

Revert "Get rid of some warnings" 

This reverts commit 3d45ba29d8.
This commit is contained in:
twinaphex 2017-06-18 20:02:50 +02:00
parent b134c5d23c
commit 914acd3956
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
input/input_driver.c
View File

@ -677,9 +677,6 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;
joypad_info.joy_idx = 0;
joypad_info.auto_binds = NULL;
joypad_info.joy_idx = input_driver_axis_threshold;
if (current_input->keyboard_mapping_is_blocked
&& current_input->keyboard_mapping_is_blocked(current_input_data))
@ -704,6 +701,7 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
joypad_info.joy_idx = settings->uints.input_joypad_map[port];
joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx];
joypad_info.axis_threshold = input_driver_axis_threshold;
if (htkey->valid
&& current_input->input_state(current_input_data, joypad_info,
@ -744,6 +742,7 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
joypad_info.joy_idx = settings->uints.input_joypad_map[port];
joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx];
joypad_info.axis_threshold = input_driver_axis_threshold;
joykey = (input_config_binds[port][i].joykey != NO_BTN)
? input_config_binds[port][i].joykey : joypad_info.auto_binds[i].joykey;