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

fix exiting to game from re-entering menu

Browse Source
This commit is contained in:
dborth 2009-05-28 04:16:41 +00:00
parent 66df5e9c87
commit 44d23d6d43
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/ngc/input.cpp
View File

@ -548,6 +548,27 @@ void decodepad (int pad)
#endif #endif
} }
bool MenuRequested()
{
for(int i=0; i<4; i++)
{
if (
(userInput[i].pad.substickX < -70) ||
(userInput[i].pad.btns_h & PAD_TRIGGER_L &&
userInput[i].pad.btns_h & PAD_TRIGGER_R &&
userInput[i].pad.btns_h & PAD_BUTTON_X &&
userInput[i].pad.btns_h & PAD_BUTTON_Y
) ||
(userInput[i].wpad.btns_h & WPAD_BUTTON_HOME) ||
(userInput[i].wpad.btns_h & WPAD_CLASSIC_BUTTON_HOME)
)
{
return true;
}
}
return false;
}
/**************************************************************************** /****************************************************************************
* NGCReportButtons * NGCReportButtons
* *
@ -569,22 +590,8 @@ void NGCReportButtons ()
* OR "Home" on the wiimote or classic controller * OR "Home" on the wiimote or classic controller
* OR LEFT on classic right analog stick * OR LEFT on classic right analog stick
*/ */
for(i=0; i<4; i++) if(MenuRequested())
{ ScreenshotRequested = 1; // go to the menu
if (
(userInput[i].pad.substickX < -70) ||
(userInput[i].pad.btns_h & PAD_TRIGGER_L &&
userInput[i].pad.btns_h & PAD_TRIGGER_R &&
userInput[i].pad.btns_h & PAD_BUTTON_X &&
userInput[i].pad.btns_h & PAD_BUTTON_Y
) ||
(userInput[i].wpad.btns_h & WPAD_BUTTON_HOME) ||
(userInput[i].wpad.btns_h & WPAD_CLASSIC_BUTTON_HOME)
)
{
ScreenshotRequested = 1; // go to the menu
}
}
j = (Settings.MultiPlayer5Master == true ? 4 : 2); j = (Settings.MultiPlayer5Master == true ? 4 : 2);

1
source/ngc/input.h
View File

@ -33,5 +33,6 @@ void decodepad (int pad);
void NGCReportButtons (); void NGCReportButtons ();
void SetControllers (); void SetControllers ();
void SetDefaultButtonMap (); void SetDefaultButtonMap ();
bool MenuRequested();
#endif #endif

4
source/ngc/menu.cpp
View File

@ -3699,6 +3699,10 @@ MainMenu (int menu)
ShutoffRumble(); ShutoffRumble();
#endif #endif
// wait for keys to be depressed
while(MenuRequested())
usleep(THREAD_SLEEP);
CancelAction(); CancelAction();
HaltGui(); HaltGui();