button mapping cleared on Home press

This commit is contained in:
dborth 2009-06-18 04:48:02 +00:00
parent 3d1065a3ad
commit 178988471a

View File

@ -2349,19 +2349,19 @@ ButtonMappingWindow()
{ {
case CTRLR_GCPAD: case CTRLR_GCPAD:
#ifdef HW_RVL #ifdef HW_RVL
sprintf(msg, "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to cancel."); sprintf(msg, "Press any button on the GameCube Controller now. Press Home or the C-Stick in any direction to clear the existing mapping.");
#else #else
sprintf(msg, "Press any button on the GameCube Controller now. Press the C-Stick in any direction to cancel."); sprintf(msg, "Press any button on the GameCube Controller now. Press the C-Stick in any direction to clear the existing mapping.");
#endif #endif
break; break;
case CTRLR_WIIMOTE: case CTRLR_WIIMOTE:
sprintf(msg, "Press any button on the Wiimote now. Press Home to cancel."); sprintf(msg, "Press any button on the Wiimote now. Press Home to clear the existing mapping.");
break; break;
case CTRLR_CLASSIC: case CTRLR_CLASSIC:
sprintf(msg, "Press any button on the Classic Controller now. Press Home to cancel."); sprintf(msg, "Press any button on the Classic Controller now. Press Home to clear the existing mapping.");
break; break;
case CTRLR_NUNCHUK: case CTRLR_NUNCHUK:
sprintf(msg, "Press any button on the Wiimote or Nunchuk now. Press Home to cancel."); sprintf(msg, "Press any button on the Wiimote or Nunchuk now. Press Home to clear the existing mapping.");
break; break;
} }
@ -2446,7 +2446,6 @@ static int MenuSettingsMappingsMap()
{ {
int menu = MENU_NONE; int menu = MENU_NONE;
int ret,i,j; int ret,i,j;
u32 pressed;
OptionList options; OptionList options;
char menuTitle[100]; char menuTitle[100];
@ -2549,10 +2548,7 @@ static int MenuSettingsMappingsMap()
if(ret >= 0) if(ret >= 0)
{ {
pressed = ButtonMappingWindow(); // get a button selection from user btnmap[mapMenuCtrlNES][mapMenuCtrl][ret] = ButtonMappingWindow(); // get a button selection from user
if (pressed > 0)
btnmap[mapMenuCtrlNES][mapMenuCtrl][ret] = pressed; // update mapping
} }
if(backBtn.GetState() == STATE_CLICKED) if(backBtn.GetState() == STATE_CLICKED)