fixed controller mapping Reset button bug

This commit is contained in:
dborth 2009-07-01 17:15:21 +00:00
parent 941db39a11
commit 9dcf4c2387
2 changed files with 6 additions and 6 deletions

View File

@ -62,7 +62,7 @@ void ResetControls(int wiiCtrl)
vbapadmap[i++] = VBA_BUTTON_R;
/*** Gamecube controller Padmap ***/
if(wiiCtrl == CTRLR_GCPAD || wiiCtrl == 0)
if(wiiCtrl == CTRLR_GCPAD || wiiCtrl == -1)
{
i=0;
btnmap[CTRLR_GCPAD][i++] = PAD_BUTTON_B;
@ -78,7 +78,7 @@ void ResetControls(int wiiCtrl)
}
/*** Wiimote Padmap ***/
if(wiiCtrl == CTRLR_WIIMOTE || wiiCtrl == 0)
if(wiiCtrl == CTRLR_WIIMOTE || wiiCtrl == -1)
{
i=0;
btnmap[CTRLR_WIIMOTE][i++] = WPAD_BUTTON_1;
@ -94,7 +94,7 @@ void ResetControls(int wiiCtrl)
}
/*** Classic Controller Padmap ***/
if(wiiCtrl == CTRLR_CLASSIC || wiiCtrl == 0)
if(wiiCtrl == CTRLR_CLASSIC || wiiCtrl == -1)
{
i=0;
btnmap[CTRLR_CLASSIC][i++] = WPAD_CLASSIC_BUTTON_Y;
@ -110,7 +110,7 @@ void ResetControls(int wiiCtrl)
}
/*** Nunchuk + wiimote Padmap ***/
if(wiiCtrl == CTRLR_NUNCHUK || wiiCtrl == 0)
if(wiiCtrl == CTRLR_NUNCHUK || wiiCtrl == -1)
{
i=0;
btnmap[CTRLR_NUNCHUK][i++] = WPAD_NUNCHUK_BUTTON_C;
@ -126,7 +126,7 @@ void ResetControls(int wiiCtrl)
}
/*** Keyboard map ***/
if(wiiCtrl == CTRLR_KEYBOARD || wiiCtrl == 0)
if(wiiCtrl == CTRLR_KEYBOARD || wiiCtrl == -1)
{
i=0;
btnmap[CTRLR_KEYBOARD][i++] = KB_X; // VBA stupidly has B on the right instead of left

View File

@ -34,7 +34,7 @@
extern int rumbleRequest[4];
extern u32 btnmap[5][10];
void ResetControls(int wc = 0);
void ResetControls(int wc = -1);
void ShutoffRumble();
void DoRumble(int i);
void systemGameRumble(int RumbleForFrames);