fix PREFSMAN->m_bDelayedScreenLoad

This commit is contained in:
Glenn Maynard
2004-12-15 00:23:50 +00:00
parent c4087d1cf9
commit 74886cc5e9
2 changed files with 3 additions and 4 deletions
+3 -3
View File
@@ -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. */
-1
View File
@@ -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();