Skip to content

Commit

Permalink
Small micro-opts to input_state
Browse files Browse the repository at this point in the history
  • Loading branch information
inactive123 committed Jan 22, 2017
1 parent 9523afd commit c283d2c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions input/input_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,11 @@ void input_poll(void)
int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id)
{
rarch_joypad_info_t joypad_info;
int16_t res = 0;
settings_t *settings = config_get_ptr();

device &= RETRO_DEVICE_MASK;

joypad_info.axis_threshold = settings->input.axis_threshold;

if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_ON, NULL))
{
int16_t ret;
Expand Down Expand Up @@ -384,8 +381,12 @@ int16_t input_state(unsigned port, unsigned device,

if (bind_valid)
{
rarch_joypad_info_t joypad_info;

joypad_info.axis_threshold = settings->input.axis_threshold;
joypad_info.joy_idx = settings->input.joypad_map[port];
joypad_info.auto_binds = settings->input.autoconf_binds[joypad_info.joy_idx];

res = current_input->input_state(
current_input_data, joypad_info, libretro_input_binds, port, device, idx, id);
}
Expand Down

0 comments on commit c283d2c

Please sign in to comment.