From 59c317dc1db847badf04c78fffa15236c093882b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 4 Dec 2016 20:20:35 +0100 Subject: [PATCH] Pass pointers to input_push_analog_dpad --- gfx/drivers_tracker/video_state_python.c | 12 ++++++++---- input/input_driver.c | 12 ++++++++---- runloop.c | 6 ++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gfx/drivers_tracker/video_state_python.c b/gfx/drivers_tracker/video_state_python.c index afd8e62583..867992bc97 100644 --- a/gfx/drivers_tracker/video_state_python.c +++ b/gfx/drivers_tracker/video_state_python.c @@ -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) diff --git a/input/input_driver.c b/input/input_driver.c index d56e6e4dd6..b6ef0422b2 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -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; diff --git a/runloop.c b/runloop.c index 8db4f35fb0..f4384f7a13 100644 --- a/runloop.c +++ b/runloop.c @@ -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]); }