actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix up and simplify prepared screen logic

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-25 06:24:22 +00:00
parent 0f113604b4
commit f85136f2a8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+10 -5
View File
@@ -682,10 +682,13 @@ void ScreenManager::LoadDelayedScreen()
// Pop the top screen, if any. // Pop the top screen, if any.
ScreenMessage SM = PopTopScreenInternal(); ScreenMessage SM = PopTopScreenInternal();
/* We have a screen to display. Delete the current screens and load it. */ /* If the screen is already prepared, activate it before performing any cleanup, so
* it doesn't get deleted by cleanup. */
Screen *pScreen = ActivatePreparedScreenAndBackground( sScreenName );
bool bTimeToDeleteScreens = (g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end()); bool bTimeToDeleteScreens = (g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end());
vector<Actor*> apActorsToDelete; vector<Actor*> apActorsToDelete;
if( bTimeToDeleteScreens && !ScreenIsPrepped(sScreenName) ) if( bTimeToDeleteScreens )
{ {
/* It's time to delete all old prepared screens. Depending on DelayedScreenLoad, /* It's time to delete all old prepared screens. Depending on DelayedScreenLoad,
* we can either delete the screens before or after we load the new screen. Either * we can either delete the screens before or after we load the new screen. Either
@@ -699,11 +702,13 @@ void ScreenManager::LoadDelayedScreen()
GrabPreparedActors( apActorsToDelete ); GrabPreparedActors( apActorsToDelete );
} }
// Load the screen, if it's not already prepared. /* If the screen wasn't already prepared, load it. */
if( pScreen == NULL )
{
PrepareScreen( sScreenName ); PrepareScreen( sScreenName );
pScreen = ActivatePreparedScreenAndBackground( sScreenName );
Screen *pScreen = ActivatePreparedScreenAndBackground( sScreenName );
ASSERT( pScreen != NULL ); ASSERT( pScreen != NULL );
}
bool bIsOnSystemMenu = pScreen->GetScreenType() == system_menu; bool bIsOnSystemMenu = pScreen->GetScreenType() == system_menu;