Only SWME::BeginScreen calls TweenOnScreen. TweenOnScreen should only do ON_COMMANDs. Move SortByDrawOrder out.

This commit is contained in:
Glenn Maynard
2006-06-24 17:58:43 +00:00
parent b44ad7a4e0
commit 3685ff4cd8
+1 -2
View File
@@ -144,6 +144,7 @@ void ScreenWithMenuElements::BeginScreen()
this->PlayCommand( "On" ); this->PlayCommand( "On" );
else else
TweenOnScreen(); // deprecated TweenOnScreen(); // deprecated
this->SortByDrawOrder();
m_In.StartTransitioning( SM_DoneFadingIn ); m_In.StartTransitioning( SM_DoneFadingIn );
Screen::BeginScreen(); Screen::BeginScreen();
@@ -177,8 +178,6 @@ void ScreenWithMenuElements::TweenOnScreen()
ON_COMMAND( m_textHelp ); ON_COMMAND( m_textHelp );
ON_COMMAND( m_sprUnderlay ); ON_COMMAND( m_sprUnderlay );
ON_COMMAND( m_sprOverlay ); ON_COMMAND( m_sprOverlay );
this->SortByDrawOrder();
} }
ScreenWithMenuElements::~ScreenWithMenuElements() ScreenWithMenuElements::~ScreenWithMenuElements()