CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-26 05:16:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport Lioncash's changes - https://github.com/libretro/RetroArch/pull/1170

Browse Source
This commit is contained in:
twinaphex 2014-10-21 02:27:48 +02:00
parent 3a947c450b
commit 00115d1ebb
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_autodetect.c
View File

@ -161,8 +161,6 @@ void input_config_autoconfigure_joypad(unsigned idx,
const struct retro_keybind *input_get_auto_bind(unsigned port, unsigned id)
{
int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx < 0)
return NULL;
unsigned int joy_idx = g_settings.input.joypad_map[port];
return &g_settings.input.autoconf_binds[joy_idx][id];
}

12
input/input_common.c
View File

@ -148,8 +148,8 @@ bool input_joypad_set_rumble(const rarch_joypad_driver_t *drv,
if (!drv || !drv->set_rumble)
return false;
int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx < 0 || joy_idx >= MAX_PLAYERS)
unsigned int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx >= MAX_PLAYERS)
return false;
return drv->set_rumble(joy_idx, effect, strength);
@ -161,8 +161,8 @@ bool input_joypad_pressed(const rarch_joypad_driver_t *drv,
if (!drv)
return false;
int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx < 0 || joy_idx >= MAX_PLAYERS)
unsigned int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx >= MAX_PLAYERS)
return false;
/* Auto-binds are per joypad, not per player. */
@ -195,8 +195,8 @@ int16_t input_joypad_analog(const rarch_joypad_driver_t *drv,
if (!drv)
return 0;
int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx < 0 || joy_idx >= MAX_PLAYERS)
unsigned int joy_idx = g_settings.input.joypad_map[port];
if (joy_idx >= MAX_PLAYERS)
return 0;
/* Auto-binds are per joypad, not per player. */