PlayersFinalized removed
This commit is contained in:
@@ -62,8 +62,6 @@ void ScreenSelect::BeginScreen()
|
|||||||
{
|
{
|
||||||
ScreenWithMenuElements::BeginScreen();
|
ScreenWithMenuElements::BeginScreen();
|
||||||
|
|
||||||
m_bTimeToFinalizePlayers = false;
|
|
||||||
|
|
||||||
m_timerIdleComment.GetDeltaTime();
|
m_timerIdleComment.GetDeltaTime();
|
||||||
m_timerIdleTimeout.GetDeltaTime();
|
m_timerIdleTimeout.GetDeltaTime();
|
||||||
|
|
||||||
@@ -185,29 +183,9 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
|
|
||||||
SCREENMAN->RefreshCreditsMessages();
|
SCREENMAN->RefreshCreditsMessages();
|
||||||
|
|
||||||
//
|
|
||||||
// Finalize players if we set a style on this screen.
|
|
||||||
//
|
|
||||||
FOREACH_HumanPlayer( p )
|
|
||||||
{
|
|
||||||
const int sel = GetSelectionIndex( p );
|
|
||||||
if( m_aGameCommands[sel].m_pStyle )
|
|
||||||
{
|
|
||||||
m_bTimeToFinalizePlayers = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if( !IsTransitioning() )
|
if( !IsTransitioning() )
|
||||||
StartTransitioningScreen( SM_GoToNextScreen );
|
StartTransitioningScreen( SM_GoToNextScreen );
|
||||||
}
|
}
|
||||||
else if( SM == SM_GoToNextScreen )
|
|
||||||
{
|
|
||||||
/* Finalizing players can take a long time, since it reads profile data. Do it
|
|
||||||
* here.(XXX: this should be done in a separate screen.) */
|
|
||||||
if( m_bTimeToFinalizePlayers )
|
|
||||||
GAMESTATE->PlayersFinalized();
|
|
||||||
}
|
|
||||||
|
|
||||||
ScreenWithMenuElements::HandleScreenMessage( SM );
|
ScreenWithMenuElements::HandleScreenMessage( SM );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,9 +35,6 @@ protected:
|
|||||||
ThemeMetric<float> IDLE_COMMENT_SECONDS;
|
ThemeMetric<float> IDLE_COMMENT_SECONDS;
|
||||||
ThemeMetric<float> IDLE_TIMEOUT_SECONDS;
|
ThemeMetric<float> IDLE_TIMEOUT_SECONDS;
|
||||||
ThemeMetric<bool> ALLOW_DISABLED_PLAYER_INPUT;
|
ThemeMetric<bool> ALLOW_DISABLED_PLAYER_INPUT;
|
||||||
|
|
||||||
private:
|
|
||||||
bool m_bTimeToFinalizePlayers;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user