This commit is contained in:
Glenn Maynard
2005-07-13 06:49:30 +00:00
parent a6cb2db9f2
commit e1dae4bf04
+7 -5
View File
@@ -215,10 +215,15 @@ void ScreenManager::Update( float fDeltaTime )
/* Don't call BackgroundPrepareScreen() from within another background load. */ /* Don't call BackgroundPrepareScreen() from within another background load. */
ASSERT( !IsConcurrentlyLoading() ); ASSERT( !IsConcurrentlyLoading() );
/* Push rendering into a thread, and prepare the screen. */ CString sScreenName = m_sDelayedConcurrentPrepare;
m_sDelayedConcurrentPrepare = "";
ScreenMessage SM = m_OnDonePreparingScreen;
m_OnDonePreparingScreen = SM_None;
g_bIsConcurrentlyLoading = true; g_bIsConcurrentlyLoading = true;
StartConcurrentRendering(); StartConcurrentRendering();
PrepareScreen( m_sDelayedConcurrentPrepare ); PrepareScreen( sScreenName );
FinishConcurrentRendering(); FinishConcurrentRendering();
g_bIsConcurrentlyLoading = false; g_bIsConcurrentlyLoading = false;
@@ -226,9 +231,6 @@ void ScreenManager::Update( float fDeltaTime )
/* We're done. Send the message. The screen is allowed to start /* We're done. Send the message. The screen is allowed to start
* another concurrent prepare from this message. */ * another concurrent prepare from this message. */
ScreenMessage SM = m_OnDonePreparingScreen;
m_sDelayedConcurrentPrepare = "";
m_OnDonePreparingScreen = SM_None;
SendMessageToTopScreen( SM ); SendMessageToTopScreen( SM );
} }
} }