The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-27 21:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

button mapping cleared on Home press

Browse Source
This commit is contained in:
dborth 2009-06-18 04:48:26 +00:00
parent b80e800101
commit 026a1860a7
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/ngc/menu.cpp
View File

@ -2400,19 +2400,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;
} }
@ -2455,7 +2455,7 @@ ButtonMappingWindow()
{ {
pressed = userInput[0].wpad.btns_d; 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) if(pressed != WPAD_BUTTON_HOME)
{ {
switch(mapMenuCtrl) switch(mapMenuCtrl)
@ -2497,7 +2497,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];
@ -2616,10 +2615,7 @@ static int MenuSettingsMappingsMap()
if(ret >= 0) if(ret >= 0)
{ {
pressed = ButtonMappingWindow(); // get a button selection from user btnmap[mapMenuCtrlSNES][mapMenuCtrl][ret] = ButtonMappingWindow(); // get a button selection from user
if (pressed > 0)
btnmap[mapMenuCtrlSNES][mapMenuCtrl][ret] = pressed; // update mapping
} }
if(backBtn.GetState() == STATE_CLICKED) if(backBtn.GetState() == STATE_CLICKED)