gered/sdl-wii
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix bug where classic UP is mis-identified as nunchuk Z (same key code)

Browse source
This commit is contained in:
simon.kagstrom 2009-05-25 17:48:07 +00:00
parent e9a7132651
commit 1dd586df01
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SDL/src/joystick/wii/SDL_sysjoystick.c
View file

@ -97,9 +97,9 @@ static const u32 sdl_buttons_wii[] =
WPAD_BUTTON_MINUS,
WPAD_BUTTON_PLUS,
WPAD_BUTTON_HOME,
WPAD_NUNCHUK_BUTTON_Z,
WPAD_NUNCHUK_BUTTON_C,
WPAD_CLASSIC_BUTTON_A,
WPAD_NUNCHUK_BUTTON_Z, /* 7 */
WPAD_NUNCHUK_BUTTON_C, /* 8 */
WPAD_CLASSIC_BUTTON_A, /* 9 */
WPAD_CLASSIC_BUTTON_B,
WPAD_CLASSIC_BUTTON_X,
WPAD_CLASSIC_BUTTON_Y,
@ -131,6 +131,16 @@ static int __numgcjoysticks = 4;
static int __num_joysticks_open = 0;
static int wii_button_is_nunchuk(int idx)
{
return idx == 7 || idx == 8;
}
static int wii_button_is_classic(int idx)
{
return idx >= 9;
}
/* Function to scan the system for joysticks.
* This function should return the number of available
* joysticks. Joystick 0 should be the system default joystick.
@ -301,6 +311,10 @@ static void _HandleWiiJoystickUpdate(SDL_Joystick* joystick)
for(i = 0; i < (sizeof(sdl_buttons_wii) / sizeof(sdl_buttons_wii[0])); i++)
{
if ( (exp_type == WPAD_EXP_CLASSIC && wii_button_is_nunchuk(i)) ||
(exp_type == WPAD_EXP_NUNCHUK && wii_button_is_classic(i)) )
continue;
if (changed & sdl_buttons_wii[i])
SDL_PrivateJoystickButton(joystick, i,
(buttons & sdl_buttons_wii[i]) ? SDL_PRESSED : SDL_RELEASED);