The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-25 12:06:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

speed up returning to menu from in-game

Browse Source
This commit is contained in:
Daryl Borth 2018-08-27 10:40:21 -06:00
parent b861ecb77b
commit b738b86176
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source/menu.cpp
View File

@ -71,9 +71,6 @@ static int mapMenuCtrl = 0;
static lwp_t guithread = LWP_THREAD_NULL; static lwp_t guithread = LWP_THREAD_NULL;
static lwp_t progressthread = LWP_THREAD_NULL; static lwp_t progressthread = LWP_THREAD_NULL;
#ifdef HW_RVL
static lwp_t updatethread = LWP_THREAD_NULL;
#endif
static bool guiHalt = true; static bool guiHalt = true;
static int showProgress = 0; static int showProgress = 0;
@ -4590,13 +4587,12 @@ static int MenuPalette()
void void
MainMenu (int menu) MainMenu (int menu)
{ {
static bool init = false; static bool firstRun = true;
int currentMenu = menu; int currentMenu = menu;
lastMenu = MENU_NONE; lastMenu = MENU_NONE;
if(!init) if(firstRun)
{ {
init = true;
#ifdef HW_RVL #ifdef HW_RVL
pointer[0] = new GuiImageData(player1_point_png); pointer[0] = new GuiImageData(player1_point_png);
pointer[1] = new GuiImageData(player2_point_png); pointer[1] = new GuiImageData(player2_point_png);
@ -4662,14 +4658,14 @@ MainMenu (int menu)
if(currentMenu == MENU_GAMESELECTION) if(currentMenu == MENU_GAMESELECTION)
ResumeGui(); ResumeGui();
if(firstRun) {
// Load preferences // Load preferences
if(!LoadPrefs()) if(!LoadPrefs())
SavePrefs(SILENT); SavePrefs(SILENT);
}
#ifdef HW_RVL #ifdef HW_RVL
static bool checkIOS = true; if(firstRun)
if(checkIOS)
{ {
u32 ios = IOS_GetVersion(); u32 ios = IOS_GetVersion();
@ -4678,14 +4674,10 @@ MainMenu (int menu)
else if(!SaneIOS(ios)) else if(!SaneIOS(ios))
ErrorPrompt("The current IOS has been altered (fake-signed). Functionality and/or stability may be adversely affected."); ErrorPrompt("The current IOS has been altered (fake-signed). Functionality and/or stability may be adversely affected.");
} }
checkIOS = false;
#endif #endif
// Load palettes
LoadPalettes();
#ifndef NO_SOUND #ifndef NO_SOUND
if(firstRun) {
bgMusic = new GuiSound(bg_music_ogg, bg_music_ogg_size, SOUND_OGG); bgMusic = new GuiSound(bg_music_ogg, bg_music_ogg_size, SOUND_OGG);
bgMusic->SetVolume(GCSettings.MusicVolume); bgMusic->SetVolume(GCSettings.MusicVolume);
bgMusic->SetLoop(true); bgMusic->SetLoop(true);
@ -4693,9 +4685,18 @@ MainMenu (int menu)
enterSound->SetVolume(GCSettings.SFXVolume); enterSound->SetVolume(GCSettings.SFXVolume);
exitSound = new GuiSound(exit_ogg, exit_ogg_size, SOUND_OGG); exitSound = new GuiSound(exit_ogg, exit_ogg_size, SOUND_OGG);
exitSound->SetVolume(GCSettings.SFXVolume); exitSound->SetVolume(GCSettings.SFXVolume);
if(currentMenu == MENU_GAMESELECTION) bgMusic->Play(); // startup music }
if(currentMenu == MENU_GAMESELECTION)
bgMusic->Play(); // startup music
#endif #endif
if(firstRun) {
LoadPalettes();
}
firstRun = false;
while(currentMenu != MENU_EXIT || !ROMLoaded) while(currentMenu != MENU_EXIT || !ROMLoaded)
{ {
switch (currentMenu) switch (currentMenu)
@ -4760,17 +4761,6 @@ MainMenu (int menu)
CancelAction(); CancelAction();
HaltGui(); HaltGui();
#ifdef HW_RVL
if(updatethread != LWP_THREAD_NULL)
LWP_JoinThread(updatethread, NULL);
#endif
#ifndef NO_SOUND
delete bgMusic;
delete enterSound;
delete exitSound;
#endif
delete btnLogo; delete btnLogo;
delete gameScreenImg; delete gameScreenImg;
delete bgTopImg; delete bgTopImg;