From cc827025ea970c50851c137acdddb6fa588006b6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 19 Jul 2005 23:49:39 +0000
Subject: [PATCH] merge MakeNewScreenInternal and MakeNewScreen

---
 stepmania/src/ScreenManager.cpp | 11 ++---------
 stepmania/src/ScreenManager.h   |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 76f4213a78..f57400390f 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -98,7 +98,7 @@ void ScreenManager::ThemeChanged()
 	split( sOverlays, ",", asOverlays );
 	for( unsigned i=0; i<asOverlays.size(); i++ )
 	{
-		Screen *pScreen = MakeNewScreenInternal( asOverlays[i] );
+		Screen *pScreen = MakeNewScreen( asOverlays[i] );
 		m_OverlayScreens.push_back( pScreen );
 	}
 	
@@ -296,7 +296,7 @@ void ScreenManager::Input( const DeviceInput& DeviceI, const InputEventType type
 }
 
 /* Just create a new screen; don't do any associated cleanup. */
-Screen* ScreenManager::MakeNewScreenInternal( const CString &sScreenName )
+Screen* ScreenManager::MakeNewScreen( const CString &sScreenName )
 {
 	RageTimer t;
 	LOG->Trace( "Loading screen name '%s'", sScreenName.c_str() );
@@ -316,13 +316,6 @@ Screen* ScreenManager::MakeNewScreenInternal( const CString &sScreenName )
 	return ret;
 }
 
-Screen* ScreenManager::MakeNewScreen( const CString &sScreenName )
-{
-	Screen* ret = MakeNewScreenInternal( sScreenName );
-
-	return ret;
-}
-
 void ScreenManager::PrepareScreen( const CString &sScreenName )
 {
 	// If the screen is already prepared, stop.
diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h
index 2a5ea09526..8e6077f3d9 100644
--- a/stepmania/src/ScreenManager.h
+++ b/stepmania/src/ScreenManager.h
@@ -101,7 +101,6 @@ private:
 	bool				m_bZeroNextUpdate;
 
 	Screen* MakeNewScreen( const CString &sName );
-	Screen* MakeNewScreenInternal( const CString &sName );
 	void ClearScreenStack();
 	void LoadDelayedScreen();