The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-06-10 20:48:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix wii u pro controller button mapping not being used in one case

Browse Source
This commit is contained in:
Daryl Borth 2020-03-01 10:06:08 -07:00
parent b80827f36e
commit de7e5bebf3
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/input.cpp
View File

@ -906,15 +906,22 @@ static u32 DecodeJoy(unsigned short pad)
}
else if(wpad_exp_type == WPAD_EXP_CLASSIC)
{ // classic controller
for (u32 i =0; i < MAXJP; ++i)
{
if ((pad_btns_h & btnmap[CTRLR_GCPAD][i]) // gamecube controller
|| ( wiidrcp_btns_h & btnmap[CTRLR_WIIDRC][i] ) //wiiu gamepad
|| ( (wpad_btns_h & btnmap[CTRLR_CLASSIC][i]) ))
J |= vbapadmap[i];
if (wp->exp.classic.type == 2) {
for (u32 i = 0; i < MAXJP; ++i)
{
if (wpad_btns_h & btnmap[CTRLR_WUPC][i] )
J |= vbapadmap[i];
}
}
else {
for (u32 i = 0; i < MAXJP; ++i)
{
if ((pad_btns_h & btnmap[CTRLR_GCPAD][i]) // gamecube controller
|| ( wiidrcp_btns_h & btnmap[CTRLR_WIIDRC][i] ) //wiiu gamepad
|| ( (wpad_btns_h & btnmap[CTRLR_CLASSIC][i]) ))
J |= vbapadmap[i];
}
}
}
else if(wpad_exp_type == WPAD_EXP_NUNCHUK)
{ // nunchuk + wiimote