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

input_driver.c - cleanup

Browse Source
This commit is contained in:
twinaphex 2017-01-23 02:28:25 +01:00
parent 3a711f6d4f
commit daf0e90f82
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
input/input_driver.c
View File

@ -476,22 +476,16 @@ static const unsigned buttons[] = {
void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
{
unsigned i;
rarch_joypad_info_t joypad_info;
const struct retro_keybind *binds[MAX_USERS];
settings_t *settings = config_get_ptr();
unsigned max_users = settings->input.max_users;
/* Only bind for up to two players for now. */
for (i = 0; i < max_users; i++)
binds[i] = settings->input.binds[i];
joypad_info.axis_threshold = settings->input.axis_threshold;
for (i = 0; i < max_users; i++)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
enum analog_dpad_mode dpad_mode = (enum analog_dpad_mode)settings->input.analog_dpad_mode[i];
binds[i] = settings->input.binds[i];
if (dpad_mode == ANALOG_DPAD_NONE)
continue;
@ -502,6 +496,9 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
if (!input_driver_block_libretro_input)
{
rarch_joypad_info_t joypad_info;
joypad_info.axis_threshold = settings->input.axis_threshold;
for (i = 4; i < 16; i++)
{
unsigned id = buttons[i - 4];