From 3b54c385a41c6e65fbab845c899754aa9ca66a30 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 7 Jul 2005 08:18:29 +0000
Subject: [PATCH] remove unused m_vScreensToDelete

---
 stepmania/src/ScreenManager.cpp | 26 --------------------------
 stepmania/src/ScreenManager.h   |  2 --
 2 files changed, 28 deletions(-)

diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 4e36aaf80d..6a3317b3e1 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -63,8 +63,6 @@ ScreenManager::~ScreenManager()
 {
 	LOG->Trace( "ScreenManager::~ScreenManager()" );
 
-	EmptyDeleteQueue();
-
 	SAFE_DELETE( m_pSharedBGA );
 	for( unsigned i=0; i<m_ScreenStack.size(); i++ )
 		SAFE_DELETE( m_ScreenStack[i] );
@@ -101,22 +99,6 @@ void ScreenManager::ThemeChanged()
 	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()
 {
 	if( m_ScreenStack.empty() )
@@ -198,8 +180,6 @@ void ScreenManager::Update( float fDeltaTime )
 	if( bFirstUpdate )
 		SOUND->Flush();
 
-	EmptyDeleteQueue();
-
 	if( m_sDelayedScreen.size() != 0 )
 	{
 		LoadDelayedScreen();
@@ -409,10 +389,7 @@ void ScreenManager::LoadDelayedScreen()
 	 * data.  If we don't unload the old screen here, it'll be deleted below.
 	 */
 	if( PREFSMAN->m_bDelayedScreenLoad )
-	{
 		ClearScreenStack();
-		EmptyDeleteQueue();
-	}
 
 	CString sScreenName = m_sDelayedScreen;
 	m_sDelayedScreen = "";
@@ -484,10 +461,7 @@ void ScreenManager::LoadDelayedScreen()
 		PREFSMAN->SaveGlobalPrefsToDisk();
 
 	if( !PREFSMAN->m_bDelayedScreenLoad )
-	{
 		ClearScreenStack();
-		EmptyDeleteQueue();
-	}
 
 	LOG->Trace("... SetFromNewScreen");
 	SetFromNewScreen( pNewScreen );
diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h
index a484a17049..53a8ea685b 100644
--- a/stepmania/src/ScreenManager.h
+++ b/stepmania/src/ScreenManager.h
@@ -81,7 +81,6 @@ private:
 	CString				m_sSystemMessage;
 	vector<Screen*>		m_vPreparedScreens;
 	vector<Actor*>		m_vPreparedBackgrounds;
-	vector<Screen*>		m_vScreensToDelete;
 	
 	// Screen loads and removals are delayed until the next update, so the
 	// screen being removed isn't on the stack.
@@ -95,7 +94,6 @@ private:
 	Screen* MakeNewScreen( const CString &sName );
 	Screen* MakeNewScreenInternal( const CString &sName );
 	void ClearScreenStack();
-	void EmptyDeleteQueue();
 	void LoadDelayedScreen();
 
 	// Keep these sounds always loaded, because they could be