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

(Wii) Use WPAD_Data to obtain local pointer to pad state

Browse Source
This commit is contained in:
twinaphex 2012-12-16 07:28:01 +01:00
parent 5f46f80b20
commit 49d35b2339
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gx/gx_input.c
View File

@ -323,7 +323,9 @@ static void gx_input_poll(void *data)
uint32_t type = 0; uint32_t type = 0;
if (WPAD_Probe(port, &type) == WPAD_ERR_NONE) if (WPAD_Probe(port, &type) == WPAD_ERR_NONE)
{ {
uint32_t down = WPAD_ButtonsHeld(port); WPADData *wpaddata = WPAD_Data(port);
uint32_t down = wpaddata->btns_h;
state |= (down & WPAD_BUTTON_A) ? GX_WIIMOTE_A : 0; state |= (down & WPAD_BUTTON_A) ? GX_WIIMOTE_A : 0;
state |= (down & WPAD_BUTTON_B) ? GX_WIIMOTE_B : 0; state |= (down & WPAD_BUTTON_B) ? GX_WIIMOTE_B : 0;
@ -336,8 +338,8 @@ static void gx_input_poll(void *data)
if((down & WPAD_BUTTON_HOME) && (down & WPAD_BUTTON_B)) if((down & WPAD_BUTTON_HOME) && (down & WPAD_BUTTON_B))
quit_wiimote = true; quit_wiimote = true;
expansion_t exp; expansion_t exp = wpaddata->exp;
WPAD_Expansion(port, &exp);
switch (type) switch (type)
{ {
case WPAD_EXP_NUNCHUK: case WPAD_EXP_NUNCHUK: