The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-12-26 10:41: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:20:04 +00:00
parent e6e6774757
commit 0998b084ea
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/ngc/input.cpp
View File

@ -913,15 +913,27 @@ static u32 DecodeJoy(unsigned short pad)
return J; return J;
} }
bool MenuRequested()
{
for(int i=0; i<4; i++)
{
if (
(userInput[pad].pad.substickX < -70) ||
(userInput[pad].wpad.btns_h & WPAD_BUTTON_HOME) ||
(userInput[pad].wpad.btns_h & WPAD_CLASSIC_BUTTON_HOME) ||
(DownUsbKeys[KB_ESC])
)
{
return true;
}
}
return false;
}
u32 GetJoy(int pad) u32 GetJoy(int pad)
{ {
// request to go back to menu // request to go back to menu
if ( if (MenuRequested())
(userInput[pad].pad.substickX < -70) ||
(userInput[pad].wpad.btns_h & WPAD_BUTTON_HOME) ||
(userInput[pad].wpad.btns_h & WPAD_CLASSIC_BUTTON_HOME) ||
(DownUsbKeys[KB_ESC])
)
{ {
ScreenshotRequested = 1; ScreenshotRequested = 1;
updateRumbleFrame(); updateRumbleFrame();

1
source/ngc/input.h
View File

@ -42,5 +42,6 @@ void systemGameRumbleOnlyFor(int OnlyRumbleForFrames);
void updateRumbleFrame(); void updateRumbleFrame();
s8 WPAD_Stick(u8 chan,u8 right, int axis); s8 WPAD_Stick(u8 chan,u8 right, int axis);
u32 GetJoy(int which); u32 GetJoy(int which);
bool MenuRequested();
#endif #endif

4
source/ngc/menu.cpp
View File

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