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

pull out ScreenIsPrepped

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-23 03:31:43 +00:00
parent 44dfb60616
commit 91e367754a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+11 -5
View File
@@ -126,6 +126,16 @@ namespace
SCREENMAN->PostMessageToTopScreen( SM_GainFocus, 0 ); SCREENMAN->PostMessageToTopScreen( SM_GainFocus, 0 );
} }
bool ScreenIsPrepped( const CString &sScreenName )
{
FOREACH( LoadedScreen, g_vPreparedScreens, s )
{
if( s->m_pScreen->GetName() == sScreenName )
return true;
}
return false;
}
/* If the named screen is loaded, remove it from the prepared list and /* If the named screen is loaded, remove it from the prepared list and
* return it in ls. */ * return it in ls. */
bool GetPreppedScreen( const CString &sScreenName, LoadedScreen &ls ) bool GetPreppedScreen( const CString &sScreenName, LoadedScreen &ls )
@@ -482,12 +492,8 @@ Screen* ScreenManager::MakeNewScreen( const CString &sScreenName )
void ScreenManager::PrepareScreen( const CString &sScreenName ) void ScreenManager::PrepareScreen( const CString &sScreenName )
{ {
// If the screen is already prepared, stop. // If the screen is already prepared, stop.
for( int i = (int)g_vPreparedScreens.size()-1; i>=0; i-- ) if( ScreenIsPrepped(sScreenName) )
{
const Screen *pScreen = g_vPreparedScreens[i].m_pScreen;
if( pScreen->GetName() == sScreenName )
return; return;
}
Screen* pNewScreen = MakeNewScreen(sScreenName); Screen* pNewScreen = MakeNewScreen(sScreenName);