button mapping cleared on Home press

This commit is contained in:
dborth 2009-06-18 04:48:10 +00:00
parent 99e23f239c
commit 7fdcb6f1c4

View File

@ -2229,22 +2229,19 @@ ButtonMappingWindow()
{
case CTRLR_GCPAD:
#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
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
break;
case CTRLR_KEYBOARD:
sprintf(msg, "Press any key or mouse button now. Press Esc or Home to cancel.");
break;
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;
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;
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;
}
@ -2343,7 +2340,6 @@ static int MenuSettingsMappingsMap()
{
int menu = MENU_NONE;
int ret,i,j;
u32 pressed;
OptionList options;
char menuTitle[100];
@ -2434,10 +2430,7 @@ static int MenuSettingsMappingsMap()
if(ret >= 0)
{
pressed = ButtonMappingWindow(); // get a button selection from user
if (pressed > 0)
btnmap[mapMenuCtrl][ret] = pressed; // update mapping
btnmap[mapMenuCtrl][ret] = ButtonMappingWindow(); // get a button selection from user
}
if(backBtn.GetState() == STATE_CLICKED)