mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 18:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tiny XI tweak/fix

Browse Source
This commit is contained in:
pinumbernumber 2013-08-28 16:08:44 +01:00
parent ee57fe6a95
commit a2d5d20125
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/winxinput_joypad.c
View File

@ -103,7 +103,7 @@ typedef struct
static winxinput_joypad_state g_winxinput_states[4];
static int pad_index_to_xplayer_index(unsigned pad)
static inline int pad_index_to_xplayer_index(unsigned pad)
{
return g_xbox_pad_indexes[pad];
}
@ -219,7 +219,7 @@ static bool winxinput_joypad_query_pad(unsigned pad)
{
int xplayer = pad_index_to_xplayer_index(pad);
if (xplayer > -1)
return g_winxinput_states[0].connected;
return g_winxinput_states[xplayer].connected;
else
return dinput_joypad.query_pad(pad);
}
@ -264,6 +264,8 @@ static bool winxinput_joypad_button (unsigned port_num, uint16_t joykey)
if (!(g_winxinput_states[xplayer].connected))
return false;
//return false;
uint16_t btn_word = g_winxinput_states[xplayer].xstate.Gamepad.wButtons;
@ -348,7 +350,7 @@ static void winxinput_joypad_poll(void)
{
for (unsigned i = 0; i < 4; ++i)
if (g_winxinput_states[i].connected)
if (g_XInputGetStateEx(i, &(g_winxinput_states[i].xstate)) != ERROR_SUCCESS)
if (g_XInputGetStateEx(i, &(g_winxinput_states[i].xstate)) == ERROR_DEVICE_NOT_CONNECTED)
g_winxinput_states[i].connected = false;
dinput_joypad.poll();