From 7dbb26ca3fde57b83ebdb179694a66f06455f683 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 30 Jan 2006 09:15:40 +0000 Subject: [PATCH] remove unused PushScreen hide MakeNewScreen --- stepmania/src/ScreenManager.cpp | 13 ------------- stepmania/src/ScreenManager.h | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 8d667c0d94..7a8ba33ede 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -602,19 +602,6 @@ void ScreenManager::RunConcurrentlyPrepareScreen() SendMessageToTopScreen( SM ); } -void ScreenManager::PushScreen( Screen *pNewScreen, bool bDeleteWhenDone, ScreenMessage SendOnPop ) -{ - if( g_ScreenStack.size() ) - g_ScreenStack.back().m_pScreen->HandleScreenMessage( SM_LoseFocus ); - - LoadedScreen ls; - ls.m_pScreen = pNewScreen; - ls.m_bDeleteWhenDone = bDeleteWhenDone; - ls.m_SendOnPop = SendOnPop; - - PushLoadedScreen( ls ); -} - void ScreenManager::SetNewScreen( const RString &sScreenName ) { ASSERT( sScreenName != "" ); diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h index ca18b488a0..8107d492a2 100644 --- a/stepmania/src/ScreenManager.h +++ b/stepmania/src/ScreenManager.h @@ -37,10 +37,8 @@ public: void PersistantScreen( const RString &sScreenName ); bool ConcurrentlyPrepareScreen( const RString &sScreenName, ScreenMessage send_when_done = SM_None ); bool IsConcurrentlyLoading() const; - void PushScreen( Screen *pNewScreen, bool bDeleteWhenDone=false, ScreenMessage SendOnPop=SM_None ); void PopTopScreen( ScreenMessage SM ); void PopAllScreens(); - Screen* MakeNewScreen( const RString &sName ); Screen *GetTopScreen(); // System messages @@ -82,6 +80,7 @@ private: // operations take a long time, and will cause a skip on the next update. bool m_bZeroNextUpdate; + Screen *MakeNewScreen( const RString &sName ); void LoadDelayedScreen(); Screen *ActivatePreparedScreenAndBackground( const RString &sScreenName ); ScreenMessage PopTopScreenInternal( bool bSendLoseFocus = true );