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

remove unused m_vScreensToDelete

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-07 08:18:29 +00:00
parent 28b596efa6
commit 3b54c385a4
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
-26
View File
@@ -63,8 +63,6 @@ ScreenManager::~ScreenManager()
{ {
LOG->Trace( "ScreenManager::~ScreenManager()" ); LOG->Trace( "ScreenManager::~ScreenManager()" );
EmptyDeleteQueue();
SAFE_DELETE( m_pSharedBGA ); SAFE_DELETE( m_pSharedBGA );
for( unsigned i=0; i<m_ScreenStack.size(); i++ ) for( unsigned i=0; i<m_ScreenStack.size(); i++ )
SAFE_DELETE( m_ScreenStack[i] ); SAFE_DELETE( m_ScreenStack[i] );
@@ -101,22 +99,6 @@ void ScreenManager::ThemeChanged()
this->RefreshCreditsMessages(); this->RefreshCreditsMessages();
} }
void ScreenManager::EmptyDeleteQueue()
{
if( !m_vScreensToDelete.size() )
return;
for( unsigned i=0; i<m_vScreensToDelete.size(); i++ )
SAFE_DELETE( m_vScreensToDelete[i] );
m_vScreensToDelete.clear();
/* Now that we've actually deleted a screen, it makes sense to clear out
* cached textures. */
TEXTUREMAN->DeleteCachedTextures();
TEXTUREMAN->DiagnosticOutput();
}
Screen *ScreenManager::GetTopScreen() Screen *ScreenManager::GetTopScreen()
{ {
if( m_ScreenStack.empty() ) if( m_ScreenStack.empty() )
@@ -198,8 +180,6 @@ void ScreenManager::Update( float fDeltaTime )
if( bFirstUpdate ) if( bFirstUpdate )
SOUND->Flush(); SOUND->Flush();
EmptyDeleteQueue();
if( m_sDelayedScreen.size() != 0 ) if( m_sDelayedScreen.size() != 0 )
{ {
LoadDelayedScreen(); LoadDelayedScreen();
@@ -409,10 +389,7 @@ void ScreenManager::LoadDelayedScreen()
* data. If we don't unload the old screen here, it'll be deleted below. * data. If we don't unload the old screen here, it'll be deleted below.
*/ */
if( PREFSMAN->m_bDelayedScreenLoad ) if( PREFSMAN->m_bDelayedScreenLoad )
{
ClearScreenStack(); ClearScreenStack();
EmptyDeleteQueue();
}
CString sScreenName = m_sDelayedScreen; CString sScreenName = m_sDelayedScreen;
m_sDelayedScreen = ""; m_sDelayedScreen = "";
@@ -484,10 +461,7 @@ void ScreenManager::LoadDelayedScreen()
PREFSMAN->SaveGlobalPrefsToDisk(); PREFSMAN->SaveGlobalPrefsToDisk();
if( !PREFSMAN->m_bDelayedScreenLoad ) if( !PREFSMAN->m_bDelayedScreenLoad )
{
ClearScreenStack(); ClearScreenStack();
EmptyDeleteQueue();
}
LOG->Trace("... SetFromNewScreen"); LOG->Trace("... SetFromNewScreen");
SetFromNewScreen( pNewScreen ); SetFromNewScreen( pNewScreen );
stepmania/src/ScreenManager.h
-2
View File
@@ -81,7 +81,6 @@ private:
CString m_sSystemMessage; CString m_sSystemMessage;
vector<Screen*> m_vPreparedScreens; vector<Screen*> m_vPreparedScreens;
vector<Actor*> m_vPreparedBackgrounds; vector<Actor*> m_vPreparedBackgrounds;
vector<Screen*> m_vScreensToDelete;
// Screen loads and removals are delayed until the next update, so the // Screen loads and removals are delayed until the next update, so the
// screen being removed isn't on the stack. // screen being removed isn't on the stack.
@@ -95,7 +94,6 @@ private:
Screen* MakeNewScreen( const CString &sName ); Screen* MakeNewScreen( const CString &sName );
Screen* MakeNewScreenInternal( const CString &sName ); Screen* MakeNewScreenInternal( const CString &sName );
void ClearScreenStack(); void ClearScreenStack();
void EmptyDeleteQueue();
void LoadDelayedScreen(); void LoadDelayedScreen();
// Keep these sounds always loaded, because they could be // Keep these sounds always loaded, because they could be