Pass pointers to input_push_analog_dpad

This commit is contained in:
twinaphex 2016-12-04 20:20:35 +01:00
parent 0fdb8881cb
commit 59c317dc1d
3 changed files with 20 additions and 10 deletions

View File

@ -387,9 +387,11 @@ float py_state_get(py_state_t *handle, const char *id,
for (i = 0; i < MAX_USERS; i++)
{
input_push_analog_dpad(settings->input.binds[i],
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_push_analog_dpad(general_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad(settings->input.autoconf_binds[i],
input_push_analog_dpad(auto_binds,
settings->input.analog_dpad_mode[i]);
}
@ -397,8 +399,10 @@ float py_state_get(py_state_t *handle, const char *id,
for (i = 0; i < MAX_USERS; i++)
{
input_pop_analog_dpad(settings->input.binds[i]);
input_pop_analog_dpad(settings->input.autoconf_binds[i]);
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_pop_analog_dpad(general_binds);
input_pop_analog_dpad(auto_binds);
}
if (!ret)

View File

@ -574,9 +574,11 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
for (i = 0; i < settings->input.max_users; i++)
{
input_push_analog_dpad(settings->input.binds[i],
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_push_analog_dpad(general_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad(settings->input.autoconf_binds[i],
input_push_analog_dpad(auto_binds,
settings->input.analog_dpad_mode[i]);
}
@ -790,8 +792,10 @@ uint64_t input_menu_keys_pressed(void)
return ret;
for (i = 0; i < settings->input.max_users; i++)
input_push_analog_dpad(settings->input.autoconf_binds[i],
ANALOG_DPAD_LSTICK);
{
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
input_push_analog_dpad(auto_binds, ANALOG_DPAD_LSTICK);
}
input_driver_block_libretro_input = false;
input_driver_block_hotkey = false;

View File

@ -1240,12 +1240,14 @@ int runloop_iterate(unsigned *sleep_ms)
/* Update binds for analog dpad modes. */
for (i = 0; i < settings->input.max_users; i++)
{
struct retro_keybind *general_binds = settings->input.binds[i];
struct retro_keybind *auto_binds = settings->input.autoconf_binds[i];
if (!settings->input.analog_dpad_mode[i])
continue;
input_push_analog_dpad(settings->input.binds[i],
input_push_analog_dpad(general_binds,
settings->input.analog_dpad_mode[i]);
input_push_analog_dpad(settings->input.autoconf_binds[i],
input_push_analog_dpad(auto_binds,
settings->input.analog_dpad_mode[i]);
}