ScreenWithMenuElements::BeginScreen calls SortByDrawOrder
This commit is contained in:
@@ -37,8 +37,6 @@ void ScreenBookkeeping::Init()
|
||||
}
|
||||
|
||||
ChangeView( (View)0 );
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
ScreenBookkeeping::~ScreenBookkeeping()
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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 );
|
||||
|
||||
@@ -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 );
|
||||
|
||||
@@ -54,8 +54,6 @@ void ScreenEditMenu::Init()
|
||||
SET_XY_AND_ON_COMMAND( m_textNumStepsLoadedFromProfile );
|
||||
RefreshNumStepsLoadedFromProfile();
|
||||
this->AddChild( &m_textNumStepsLoadedFromProfile );
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -730,8 +730,6 @@ void ScreenEvaluation::Init()
|
||||
break;
|
||||
}
|
||||
|
||||
this->SortByDrawOrder();
|
||||
|
||||
this->PostScreenMessage( SM_AddBonus, 1.5f );
|
||||
}
|
||||
|
||||
|
||||
@@ -802,8 +802,6 @@ void ScreenGameplay::Init()
|
||||
* positioned before we TweenOnScreen. */
|
||||
LoadNextSong();
|
||||
|
||||
this->SortByDrawOrder();
|
||||
|
||||
m_GiveUpTimer.SetZero();
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -4,13 +4,6 @@
|
||||
|
||||
REGISTER_SCREEN_CLASS( ScreenInstructions );
|
||||
|
||||
void ScreenInstructions::Init()
|
||||
{
|
||||
ScreenWithMenuElements::Init();
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
void ScreenInstructions::Input( const InputEventPlus &input )
|
||||
{
|
||||
if( IsTransitioning() )
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
class ScreenInstructions : public ScreenWithMenuElements
|
||||
{
|
||||
public:
|
||||
virtual void Init();
|
||||
|
||||
virtual void Input( const InputEventPlus &input );
|
||||
|
||||
virtual void MenuBack( const InputEventPlus &input );
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 );
|
||||
}
|
||||
|
||||
@@ -147,8 +147,6 @@ void ScreenSelectCharacter::Init()
|
||||
for( unsigned i=0; i<MAX_CHAR_ICONS_TO_SHOW; i++ )
|
||||
m_sprIcons[p][i].RunCommands( ICONS_ON_COMMAND(p) );
|
||||
}
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -123,8 +123,6 @@ void ScreenSelectDifficulty::Init()
|
||||
m_fLockInputTime = LOCK_INPUT_SECONDS;
|
||||
|
||||
this->UpdateSelectableChoices();
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
void ScreenSelectDifficulty::BeginScreen()
|
||||
|
||||
@@ -122,8 +122,6 @@ void ScreenSelectGroup::Init()
|
||||
|
||||
AfterChange();
|
||||
m_GroupList.SetSelection(0);
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -129,7 +129,6 @@ void ScreenSelectStyle::Init()
|
||||
SET_XY( m_sprPremium );
|
||||
|
||||
// let AfterChange tween Picture and Info
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
void ScreenSelectStyle::BeginScreen()
|
||||
|
||||
@@ -76,8 +76,6 @@ void ScreenSetTime::Init()
|
||||
m_TimeOffset = 0;
|
||||
m_Selection = (SetTimeSelection)0;
|
||||
ChangeSelection( 0 );
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
void ScreenSetTime::Update( float fDelta )
|
||||
|
||||
@@ -24,8 +24,6 @@ void ScreenTestLights::Init()
|
||||
m_textInputs.SetText( "" );
|
||||
SET_XY_AND_ON_COMMAND( m_textInputs );
|
||||
this->AddChild( &m_textInputs );
|
||||
|
||||
this->SortByDrawOrder();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -37,8 +37,6 @@ void ScreenTitleMenu::Init()
|
||||
{
|
||||
ScreenSelectMaster::Init();
|
||||
|
||||
this->SortByDrawOrder();
|
||||
|
||||
SOUND->PlayOnceFromAnnouncer( "title menu game name" );
|
||||
}
|
||||
|
||||
|
||||
@@ -34,8 +34,6 @@ void ScreenUnlockBrowse::Init()
|
||||
m_banner.SetName( "Banner" );
|
||||
this->AddChild( &m_banner );
|
||||
|
||||
this->SortByDrawOrder();
|
||||
|
||||
this->SubscribeToMessage( Message_MenuSelectionChanged );
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user