From a4c8b8d91d9265090a49ce375b3a3f0bf22198d0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 25 Jan 2006 05:38:14 +0000 Subject: [PATCH] cleanup (remove old transition note) --- stepmania/src/ScreenManager.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 1ae5c44797..5cfe388039 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -667,19 +667,9 @@ void ScreenManager::LoadDelayedScreen() bool b = GetPreppedScreen( sScreenName, ls ); ASSERT( b ); - if( m_sDelayedScreen != "" ) - { - // While constructing this Screen, its constructor called - // SetNewScreen again! That SetNewScreen Command should - // override this older one. + // Screens may not call SetNewScreen from the ctor or Init(). + ASSERT_M( m_sDelayedScreen.empty(), m_sDelayedScreen ); - // This is no longer allowed. Instead, figure out which screen - // you really wanted in the first place with Lua, and don't waste - // time constructing an extra screen. - - FAIL_M( ssprintf("%s, %s", sScreenName.c_str(), m_sDelayedScreen.c_str()) ); - } - // Find the prepared shared background (if any), and activate it. RString sNewBGA; if( ls.m_pScreen->UsesBackground() )