From 026a1860a76c66a9a28b103858a110bcc6d6a61b Mon Sep 17 00:00:00 2001 From: dborth Date: Thu, 18 Jun 2009 04:48:26 +0000 Subject: [PATCH] button mapping cleared on Home press --- source/ngc/menu.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp index 7b28daa..5c48a66 100644 --- a/source/ngc/menu.cpp +++ b/source/ngc/menu.cpp @@ -2400,19 +2400,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_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; } @@ -2455,7 +2455,7 @@ ButtonMappingWindow() { pressed = userInput[0].wpad.btns_d; - // always allow Home button to be pressed to cancel + // always allow Home button to be pressed to clear the existing mapping if(pressed != WPAD_BUTTON_HOME) { switch(mapMenuCtrl) @@ -2497,7 +2497,6 @@ static int MenuSettingsMappingsMap() { int menu = MENU_NONE; int ret,i,j; - u32 pressed; OptionList options; char menuTitle[100]; @@ -2616,10 +2615,7 @@ static int MenuSettingsMappingsMap() if(ret >= 0) { - pressed = ButtonMappingWindow(); // get a button selection from user - - if (pressed > 0) - btnmap[mapMenuCtrlSNES][mapMenuCtrl][ret] = pressed; // update mapping + btnmap[mapMenuCtrlSNES][mapMenuCtrl][ret] = ButtonMappingWindow(); // get a button selection from user } if(backBtn.GetState() == STATE_CLICKED)