fix back and out transitions can play at the same time

This commit is contained in:
Chris Danford
2004-01-03 20:13:51 +00:00
parent 25aac0088d
commit ad16ea6827
+5 -6
View File
@@ -68,7 +68,7 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM )
switch( SM )
{
case SM_StartClosing:
if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() )
if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() && !m_Back.IsTransitioning() )
{
m_Background.PlayOffCommand();
m_Out.StartTransitioning( SM_GoToNextScreen );
@@ -90,11 +90,10 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM )
void ScreenCaution::MenuStart( PlayerNumber pn )
{
if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() )
{
m_Background.PlayOffCommand();
m_Out.StartTransitioning( SM_GoToNextScreen );
}
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Back.IsTransitioning() )
return;
m_Background.PlayOffCommand();
m_Out.StartTransitioning( SM_GoToNextScreen );
}
void ScreenCaution::MenuBack( PlayerNumber pn )