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

move assert to the right place

Browse Source
This commit is contained in:
Glenn Maynard
2006-06-24 00:50:08 +00:00
parent c5f4baa121
commit b1fdee1bad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+3 -3
View File
@@ -512,6 +512,9 @@ Screen* ScreenManager::MakeNewScreen( const RString &sScreenName )
LOG->Trace( "Loaded '%s' ('%s') in %f", sScreenName.c_str(), sClassName.c_str(), t.GetDeltaTime() );
// Screens may not call SetNewScreen from the ctor or Init().
ASSERT_M( m_sDelayedScreen.empty(), m_sDelayedScreen );
return ret;
}
@@ -634,9 +637,6 @@ Screen *ScreenManager::ActivatePreparedScreenAndBackground( const RString &sScre
if( !GetPreppedScreen(sScreenName, ls) )
return NULL;
// Screens may not call SetNewScreen from the ctor or Init().
ASSERT_M( m_sDelayedScreen.empty(), m_sDelayedScreen );
// Find the prepared shared background (if any), and activate it.
RString sNewBGA = THEME->GetPathB(sScreenName,"background");
if( sNewBGA != g_pSharedBGA->GetName() )