diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index 709e156dd5..c7cffcd6a0 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -851,6 +851,8 @@ float ScreenRanking::SetPage( PageToShow pts ) ASSERT(0); return 0; } + + this->SortByZ(); } void ScreenRanking::TweenPageOffScreen() diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index 83da623103..fdb60cc553 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -174,6 +174,8 @@ ScreenSelectCharacter::ScreenSelectCharacter( CString sClassName ) : Screen( sCl m_sprIcons[p][i].Command( ICONS_ON_COMMAND(p) ); } TweenOnScreen(); + + this->SortByZ(); } diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp index 5fcee86d79..90c19b5aa2 100644 --- a/stepmania/src/ScreenSelectCourse.cpp +++ b/stepmania/src/ScreenSelectCourse.cpp @@ -146,6 +146,8 @@ ScreenSelectCourse::ScreenSelectCourse( CString sClassName ) : Screen( sClassNam AfterCourseChange(); TweenOnScreen(); + + this->SortByZ(); } diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 56b6329fb3..b4180ce602 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -124,6 +124,8 @@ ScreenSelectDifficulty::ScreenSelectDifficulty( CString sClassName ) : ScreenSel this->UpdateSelectableChoices(); TweenOnScreen(); + + this->SortByZ(); } void ScreenSelectDifficulty::Update( float fDelta ) diff --git a/stepmania/src/ScreenSelectDifficultyEX.cpp b/stepmania/src/ScreenSelectDifficultyEX.cpp index 4d6aff1d39..1d9eee269c 100644 --- a/stepmania/src/ScreenSelectDifficultyEX.cpp +++ b/stepmania/src/ScreenSelectDifficultyEX.cpp @@ -155,6 +155,8 @@ ScreenSelectDifficultyEX::ScreenSelectDifficultyEX( CString sClassName ) : Scree TweenOnScreen(); SetAllPlayersSelection( 0, false ); + + this->SortByZ(); } void ScreenSelectDifficultyEX::Update( float fDelta ) diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 2b7493bdb6..3508d36fb8 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -148,6 +148,8 @@ ScreenSelectGroup::ScreenSelectGroup( CString sClassName ) : Screen( sClassName AfterChange(); TweenOnScreen(); m_GroupList.SetSelection(0); + + this->SortByZ(); } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 6d02c1f5c7..fb344e9406 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -335,6 +335,8 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : Screen( sClassName AfterMusicChange(); TweenOnScreen(); + + this->SortByZ(); } diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index 3fba9539b8..bf84735ee3 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -141,6 +141,7 @@ ScreenSelectStyle::ScreenSelectStyle( CString sClassName ) : ScreenSelect( sClas SET_XY_AND_ON_COMMAND( m_sprPremium ); // let AfterChange tween Picture and Info + this->SortByZ(); } void ScreenSelectStyle::MenuLeft( PlayerNumber pn ) diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index 1bda1cc7b6..9656c84c27 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -323,6 +323,8 @@ ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName ) this->ClearMessageQueue( SM_BeginFadingOut ); // ignore ScreenAttract's SecsToShow this->PostScreenMessage( SM_BeginFadingOut, TIME_TO_DISPLAY ); + + this->SortByZ(); } ScreenUnlock::~ScreenUnlock()