From 0db4a096e5916b6008f6f9b985bf8bc29bd102ac Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 21 Nov 2006 04:32:59 +0000 Subject: [PATCH] ScreenWithMenuElements::BeginScreen calls SortByDrawOrder --- stepmania/src/ScreenBookkeeping.cpp | 2 -- stepmania/src/ScreenCenterImage.cpp | 2 -- stepmania/src/ScreenDemonstration.cpp | 3 --- stepmania/src/ScreenEdit.cpp | 3 --- stepmania/src/ScreenEditMenu.cpp | 2 -- stepmania/src/ScreenEnding.cpp | 3 --- stepmania/src/ScreenEvaluation.cpp | 2 -- stepmania/src/ScreenGameplay.cpp | 2 -- stepmania/src/ScreenGameplayLesson.cpp | 4 ---- stepmania/src/ScreenInstructions.cpp | 7 ------- stepmania/src/ScreenInstructions.h | 2 -- stepmania/src/ScreenNameEntry.cpp | 3 --- stepmania/src/ScreenPlayerOptions.cpp | 2 -- stepmania/src/ScreenSelectCharacter.cpp | 2 -- stepmania/src/ScreenSelectDifficulty.cpp | 2 -- stepmania/src/ScreenSelectGroup.cpp | 2 -- stepmania/src/ScreenSelectStyle.cpp | 1 - stepmania/src/ScreenSetTime.cpp | 2 -- stepmania/src/ScreenTestLights.cpp | 2 -- stepmania/src/ScreenTitleMenu.cpp | 2 -- stepmania/src/ScreenUnlockBrowse.cpp | 2 -- stepmania/src/ScreenUnlockStatus.cpp | 2 -- 22 files changed, 54 deletions(-) diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp index 5b53da834e..67ce599a41 100644 --- a/stepmania/src/ScreenBookkeeping.cpp +++ b/stepmania/src/ScreenBookkeeping.cpp @@ -37,8 +37,6 @@ void ScreenBookkeeping::Init() } ChangeView( (View)0 ); - - this->SortByDrawOrder(); } ScreenBookkeeping::~ScreenBookkeeping() diff --git a/stepmania/src/ScreenCenterImage.cpp b/stepmania/src/ScreenCenterImage.cpp index 394bd486c0..e3d684219d 100644 --- a/stepmania/src/ScreenCenterImage.cpp +++ b/stepmania/src/ScreenCenterImage.cpp @@ -32,8 +32,6 @@ void ScreenCenterImage::Init() m_textInstructions.SetDiffuse( RageColor(0,1,0,0) ); m_textInstructions.SetZoom( 0.8f ); this->AddChild( &m_textInstructions ); - - this->SortByDrawOrder(); } diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index f7baa3adc9..74b4920d3f 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -62,9 +62,6 @@ void ScreenDemonstration::Init() return; } - - this->SortByDrawOrder(); - ClearMessageQueue(); // remove all of the messages set in ScreenGameplay that drive "ready", "go", etc. GAMESTATE->m_bGameplayLeadIn.Set( false ); diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 4cdb15ceca..f4bc846416 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -745,9 +745,6 @@ void ScreenEdit::Init() SET_XY_AND_ON_COMMAND( m_textPlayRecordHelp ); this->AddChild( &m_textPlayRecordHelp ); - this->SortByDrawOrder(); - - m_soundAddNote.Load( THEME->GetPathS("ScreenEdit","AddNote"), true ); m_soundRemoveNote.Load( THEME->GetPathS("ScreenEdit","RemoveNote"), true ); m_soundChangeLine.Load( THEME->GetPathS("ScreenEdit","line"), true ); diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 3b1f92a4de..412043e360 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -54,8 +54,6 @@ void ScreenEditMenu::Init() SET_XY_AND_ON_COMMAND( m_textNumStepsLoadedFromProfile ); RefreshNumStepsLoadedFromProfile(); this->AddChild( &m_textNumStepsLoadedFromProfile ); - - this->SortByDrawOrder(); } diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index 8c2b6bd0a6..15c361a23f 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -107,9 +107,6 @@ void ScreenEnding::Init() this->AddChild( &m_sprRemoveMemoryCard[p] ); } - - this->SortByDrawOrder(); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") ); // Now that we've read the data from the profile, it's ok to Reset() diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index ffab003f72..0e2ecad199 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -730,8 +730,6 @@ void ScreenEvaluation::Init() break; } - this->SortByDrawOrder(); - this->PostScreenMessage( SM_AddBonus, 1.5f ); } diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 06c9108e1a..429a87d6eb 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -802,8 +802,6 @@ void ScreenGameplay::Init() * positioned before we TweenOnScreen. */ LoadNextSong(); - this->SortByDrawOrder(); - m_GiveUpTimer.SetZero(); } diff --git a/stepmania/src/ScreenGameplayLesson.cpp b/stepmania/src/ScreenGameplayLesson.cpp index 9ccb8858e8..aba7438f9a 100644 --- a/stepmania/src/ScreenGameplayLesson.cpp +++ b/stepmania/src/ScreenGameplayLesson.cpp @@ -48,8 +48,6 @@ void ScreenGameplayLesson::Init() this->AddChild( aa ); } - this->SortByDrawOrder(); - FOREACH( AutoActor, m_vPages, aa ) { bool bIsFirst = aa == m_vPages.begin(); @@ -57,8 +55,6 @@ void ScreenGameplayLesson::Init() (*aa)->PlayCommand( "On" ); } - this->SortByDrawOrder(); - // Reset stage number (not relevant in lessons) GAMESTATE->m_iCurrentStageIndex = 0; diff --git a/stepmania/src/ScreenInstructions.cpp b/stepmania/src/ScreenInstructions.cpp index 20ca12c06a..1db3676cb9 100644 --- a/stepmania/src/ScreenInstructions.cpp +++ b/stepmania/src/ScreenInstructions.cpp @@ -4,13 +4,6 @@ REGISTER_SCREEN_CLASS( ScreenInstructions ); -void ScreenInstructions::Init() -{ - ScreenWithMenuElements::Init(); - - this->SortByDrawOrder(); -} - void ScreenInstructions::Input( const InputEventPlus &input ) { if( IsTransitioning() ) diff --git a/stepmania/src/ScreenInstructions.h b/stepmania/src/ScreenInstructions.h index c348d4af0c..102c80801f 100644 --- a/stepmania/src/ScreenInstructions.h +++ b/stepmania/src/ScreenInstructions.h @@ -6,8 +6,6 @@ class ScreenInstructions : public ScreenWithMenuElements { public: - virtual void Init(); - virtual void Input( const InputEventPlus &input ); virtual void MenuBack( const InputEventPlus &input ); diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp index c5527b5cfb..1680096e7f 100644 --- a/stepmania/src/ScreenNameEntry.cpp +++ b/stepmania/src/ScreenNameEntry.cpp @@ -314,9 +314,6 @@ void ScreenNameEntry::Init() this->AddChild( &m_textCategory[p] ); } - - this->SortByDrawOrder(); - m_soundStep.Load( THEME->GetPathS(m_sName,"step") ); m_fFakeBeat = 0; } diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index b51276e2b9..c158a4f955 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -57,8 +57,6 @@ void ScreenPlayerOptions::Init() SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); - this->SortByDrawOrder(); - FOREACH_PlayerNumber( p ) m_bRowCausesDisqualified[p].resize( m_pRows.size(), false ); } diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index c580f7868f..7c0d6a5931 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -147,8 +147,6 @@ void ScreenSelectCharacter::Init() for( unsigned i=0; iSortByDrawOrder(); } diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp index 23deefbec5..6250e34c1a 100644 --- a/stepmania/src/ScreenSelectDifficulty.cpp +++ b/stepmania/src/ScreenSelectDifficulty.cpp @@ -123,8 +123,6 @@ void ScreenSelectDifficulty::Init() m_fLockInputTime = LOCK_INPUT_SECONDS; this->UpdateSelectableChoices(); - - this->SortByDrawOrder(); } void ScreenSelectDifficulty::BeginScreen() diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp index 884053b720..83e6d77367 100644 --- a/stepmania/src/ScreenSelectGroup.cpp +++ b/stepmania/src/ScreenSelectGroup.cpp @@ -122,8 +122,6 @@ void ScreenSelectGroup::Init() AfterChange(); m_GroupList.SetSelection(0); - - this->SortByDrawOrder(); } diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp index fbb94c714b..db0dd6ca22 100644 --- a/stepmania/src/ScreenSelectStyle.cpp +++ b/stepmania/src/ScreenSelectStyle.cpp @@ -129,7 +129,6 @@ void ScreenSelectStyle::Init() SET_XY( m_sprPremium ); // let AfterChange tween Picture and Info - this->SortByDrawOrder(); } void ScreenSelectStyle::BeginScreen() diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index 831141ec98..a4144d7bfc 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -76,8 +76,6 @@ void ScreenSetTime::Init() m_TimeOffset = 0; m_Selection = (SetTimeSelection)0; ChangeSelection( 0 ); - - this->SortByDrawOrder(); } void ScreenSetTime::Update( float fDelta ) diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp index b46914e21a..6a1f27457e 100644 --- a/stepmania/src/ScreenTestLights.cpp +++ b/stepmania/src/ScreenTestLights.cpp @@ -24,8 +24,6 @@ void ScreenTestLights::Init() m_textInputs.SetText( "" ); SET_XY_AND_ON_COMMAND( m_textInputs ); this->AddChild( &m_textInputs ); - - this->SortByDrawOrder(); } diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 0c506b147e..9e3a51e9f0 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -37,8 +37,6 @@ void ScreenTitleMenu::Init() { ScreenSelectMaster::Init(); - this->SortByDrawOrder(); - SOUND->PlayOnceFromAnnouncer( "title menu game name" ); } diff --git a/stepmania/src/ScreenUnlockBrowse.cpp b/stepmania/src/ScreenUnlockBrowse.cpp index 8c8c17ac1d..103db4bd71 100644 --- a/stepmania/src/ScreenUnlockBrowse.cpp +++ b/stepmania/src/ScreenUnlockBrowse.cpp @@ -34,8 +34,6 @@ void ScreenUnlockBrowse::Init() m_banner.SetName( "Banner" ); this->AddChild( &m_banner ); - this->SortByDrawOrder(); - this->SubscribeToMessage( Message_MenuSelectionChanged ); } diff --git a/stepmania/src/ScreenUnlockStatus.cpp b/stepmania/src/ScreenUnlockStatus.cpp index 7227c58238..897b7b24c3 100644 --- a/stepmania/src/ScreenUnlockStatus.cpp +++ b/stepmania/src/ScreenUnlockStatus.cpp @@ -309,8 +309,6 @@ void ScreenUnlockStatus::Init() this->ClearMessageQueue( SM_BeginFadingOut ); // ignore ScreenAttract's SecsToShow this->PostScreenMessage( SM_BeginFadingOut, TIME_TO_DISPLAY ); - - this->SortByDrawOrder(); } ScreenUnlockStatus::~ScreenUnlockStatus()