mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Input) Cleanups

Browse Source
This commit is contained in:
libretroadmin 2022-06-04 08:55:35 +02:00
parent c9149895f5
commit 85cd386cb3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
input/drivers/dinput.c
View File

@ -497,6 +497,7 @@ static int16_t dinput_input_state(
unsigned id) unsigned id)
{ {
settings_t *settings; settings_t *settings;
int16_t ret = 0;
struct dinput_input *di = (struct dinput_input*)data; struct dinput_input *di = (struct dinput_input*)data;
if (port >= MAX_USERS) if (port >= MAX_USERS)
@ -511,7 +512,6 @@ static int16_t dinput_input_state(
if (id == RETRO_DEVICE_ID_JOYPAD_MASK) if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
{ {
unsigned i; unsigned i;
int16_t ret = 0;
if (settings->uints.input_mouse_index[port] == 0) if (settings->uints.input_mouse_index[port] == 0)
{ {
@ -568,13 +568,11 @@ static int16_t dinput_input_state(
return (id < RETROK_LAST) && return (id < RETROK_LAST) &&
di->state[rarch_keysym_lut[(enum retro_key)id]] & 0x80; di->state[rarch_keysym_lut[(enum retro_key)id]] & 0x80;
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
if (binds[port])
{ {
int id_minus_key = 0; int id_minus_key = 0;
int id_plus_key = 0; int id_plus_key = 0;
unsigned id_minus = 0; unsigned id_minus = 0;
unsigned id_plus = 0; unsigned id_plus = 0;
int16_t ret = 0;
bool id_plus_valid = false; bool id_plus_valid = false;
bool id_minus_valid = false; bool id_minus_valid = false;
@ -597,9 +595,8 @@ static int16_t dinput_input_state(
if (di->state[sym] & 0x80) if (di->state[sym] & 0x80)
ret += -0x7fff; ret += -0x7fff;
} }
return ret;
} }
break; return ret;
case RARCH_DEVICE_MOUSE_SCREEN: case RARCH_DEVICE_MOUSE_SCREEN:
settings = config_get_ptr(); settings = config_get_ptr();
if (settings->uints.input_mouse_index[ port ] != 0) if (settings->uints.input_mouse_index[ port ] != 0)