From 74886cc5e9c0d475a2fe3a7b07379afdda9e5026 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 15 Dec 2004 00:23:50 +0000 Subject: [PATCH] fix PREFSMAN->m_bDelayedScreenLoad --- stepmania/src/ScreenManager.cpp | 6 +++--- stepmania/src/ScreenManager.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 3663aae649..cd2b686779 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -137,7 +137,7 @@ void ScreenManager::Update( float fDeltaTime ) * * So, let's just zero the first update for every screen. */ - ASSERT( !m_ScreenStack.empty() || m_DelayedScreen != "" ); // Why play the game if there is nothing showing? + ASSERT( !m_ScreenStack.empty() || m_sDelayedScreen != "" ); // Why play the game if there is nothing showing? m_pSharedBGA->Update( fDeltaTime ); @@ -154,7 +154,7 @@ void ScreenManager::Update( float fDeltaTime ) EmptyDeleteQueue(); - if(m_DelayedScreen.size() != 0) + if(m_sDelayedScreen.size() != 0) { /* We have a screen to display. Delete the current screens and load it. */ ClearScreenStack(); @@ -346,7 +346,7 @@ retry: return; } - if( PREFSMAN->m_bDelayedScreenLoad && m_DelayedScreen != "" ) + if( PREFSMAN->m_bDelayedScreenLoad && m_sDelayedScreen != "" ) { /* Same deal: the ctor called SetNewScreen again. Delete the screen * we just made, but don't delay again. */ diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h index 9db581cfb6..d7000092f3 100644 --- a/stepmania/src/ScreenManager.h +++ b/stepmania/src/ScreenManager.h @@ -74,7 +74,6 @@ private: Screen* MakeNewScreen( const CString &sName ); void SetFromNewScreen( Screen *pNewScreen, bool Stack ); - CString m_DelayedScreen; void ClearScreenStack(); void EmptyDeleteQueue(); void LoadDelayedScreen();