ScreenWithMenuElements::BeginScreen calls SortByDrawOrder

This commit is contained in:
Glenn Maynard
2006-11-21 04:32:59 +00:00
parent 820e56a44f
commit 0db4a096e5
22 changed files with 0 additions and 54 deletions
-2
View File
@@ -37,8 +37,6 @@ void ScreenBookkeeping::Init()
} }
ChangeView( (View)0 ); ChangeView( (View)0 );
this->SortByDrawOrder();
} }
ScreenBookkeeping::~ScreenBookkeeping() ScreenBookkeeping::~ScreenBookkeeping()
-2
View File
@@ -32,8 +32,6 @@ void ScreenCenterImage::Init()
m_textInstructions.SetDiffuse( RageColor(0,1,0,0) ); m_textInstructions.SetDiffuse( RageColor(0,1,0,0) );
m_textInstructions.SetZoom( 0.8f ); m_textInstructions.SetZoom( 0.8f );
this->AddChild( &m_textInstructions ); this->AddChild( &m_textInstructions );
this->SortByDrawOrder();
} }
-3
View File
@@ -62,9 +62,6 @@ void ScreenDemonstration::Init()
return; return;
} }
this->SortByDrawOrder();
ClearMessageQueue(); // remove all of the messages set in ScreenGameplay that drive "ready", "go", etc. ClearMessageQueue(); // remove all of the messages set in ScreenGameplay that drive "ready", "go", etc.
GAMESTATE->m_bGameplayLeadIn.Set( false ); GAMESTATE->m_bGameplayLeadIn.Set( false );
-3
View File
@@ -745,9 +745,6 @@ void ScreenEdit::Init()
SET_XY_AND_ON_COMMAND( m_textPlayRecordHelp ); SET_XY_AND_ON_COMMAND( m_textPlayRecordHelp );
this->AddChild( &m_textPlayRecordHelp ); this->AddChild( &m_textPlayRecordHelp );
this->SortByDrawOrder();
m_soundAddNote.Load( THEME->GetPathS("ScreenEdit","AddNote"), true ); m_soundAddNote.Load( THEME->GetPathS("ScreenEdit","AddNote"), true );
m_soundRemoveNote.Load( THEME->GetPathS("ScreenEdit","RemoveNote"), true ); m_soundRemoveNote.Load( THEME->GetPathS("ScreenEdit","RemoveNote"), true );
m_soundChangeLine.Load( THEME->GetPathS("ScreenEdit","line"), true ); m_soundChangeLine.Load( THEME->GetPathS("ScreenEdit","line"), true );
-2
View File
@@ -54,8 +54,6 @@ void ScreenEditMenu::Init()
SET_XY_AND_ON_COMMAND( m_textNumStepsLoadedFromProfile ); SET_XY_AND_ON_COMMAND( m_textNumStepsLoadedFromProfile );
RefreshNumStepsLoadedFromProfile(); RefreshNumStepsLoadedFromProfile();
this->AddChild( &m_textNumStepsLoadedFromProfile ); this->AddChild( &m_textNumStepsLoadedFromProfile );
this->SortByDrawOrder();
} }
-3
View File
@@ -107,9 +107,6 @@ void ScreenEnding::Init()
this->AddChild( &m_sprRemoveMemoryCard[p] ); this->AddChild( &m_sprRemoveMemoryCard[p] );
} }
this->SortByDrawOrder();
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("music scroll") );
// Now that we've read the data from the profile, it's ok to Reset() // Now that we've read the data from the profile, it's ok to Reset()
-2
View File
@@ -730,8 +730,6 @@ void ScreenEvaluation::Init()
break; break;
} }
this->SortByDrawOrder();
this->PostScreenMessage( SM_AddBonus, 1.5f ); this->PostScreenMessage( SM_AddBonus, 1.5f );
} }
-2
View File
@@ -802,8 +802,6 @@ void ScreenGameplay::Init()
* positioned before we TweenOnScreen. */ * positioned before we TweenOnScreen. */
LoadNextSong(); LoadNextSong();
this->SortByDrawOrder();
m_GiveUpTimer.SetZero(); m_GiveUpTimer.SetZero();
} }
-4
View File
@@ -48,8 +48,6 @@ void ScreenGameplayLesson::Init()
this->AddChild( aa ); this->AddChild( aa );
} }
this->SortByDrawOrder();
FOREACH( AutoActor, m_vPages, aa ) FOREACH( AutoActor, m_vPages, aa )
{ {
bool bIsFirst = aa == m_vPages.begin(); bool bIsFirst = aa == m_vPages.begin();
@@ -57,8 +55,6 @@ void ScreenGameplayLesson::Init()
(*aa)->PlayCommand( "On" ); (*aa)->PlayCommand( "On" );
} }
this->SortByDrawOrder();
// Reset stage number (not relevant in lessons) // Reset stage number (not relevant in lessons)
GAMESTATE->m_iCurrentStageIndex = 0; GAMESTATE->m_iCurrentStageIndex = 0;
-7
View File
@@ -4,13 +4,6 @@
REGISTER_SCREEN_CLASS( ScreenInstructions ); REGISTER_SCREEN_CLASS( ScreenInstructions );
void ScreenInstructions::Init()
{
ScreenWithMenuElements::Init();
this->SortByDrawOrder();
}
void ScreenInstructions::Input( const InputEventPlus &input ) void ScreenInstructions::Input( const InputEventPlus &input )
{ {
if( IsTransitioning() ) if( IsTransitioning() )
-2
View File
@@ -6,8 +6,6 @@
class ScreenInstructions : public ScreenWithMenuElements class ScreenInstructions : public ScreenWithMenuElements
{ {
public: public:
virtual void Init();
virtual void Input( const InputEventPlus &input ); virtual void Input( const InputEventPlus &input );
virtual void MenuBack( const InputEventPlus &input ); virtual void MenuBack( const InputEventPlus &input );
-3
View File
@@ -314,9 +314,6 @@ void ScreenNameEntry::Init()
this->AddChild( &m_textCategory[p] ); this->AddChild( &m_textCategory[p] );
} }
this->SortByDrawOrder();
m_soundStep.Load( THEME->GetPathS(m_sName,"step") ); m_soundStep.Load( THEME->GetPathS(m_sName,"step") );
m_fFakeBeat = 0; m_fFakeBeat = 0;
} }
-2
View File
@@ -57,8 +57,6 @@ void ScreenPlayerOptions::Init()
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
this->SortByDrawOrder();
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
m_bRowCausesDisqualified[p].resize( m_pRows.size(), false ); m_bRowCausesDisqualified[p].resize( m_pRows.size(), false );
} }
-2
View File
@@ -147,8 +147,6 @@ void ScreenSelectCharacter::Init()
for( unsigned i=0; i<MAX_CHAR_ICONS_TO_SHOW; i++ ) for( unsigned i=0; i<MAX_CHAR_ICONS_TO_SHOW; i++ )
m_sprIcons[p][i].RunCommands( ICONS_ON_COMMAND(p) ); m_sprIcons[p][i].RunCommands( ICONS_ON_COMMAND(p) );
} }
this->SortByDrawOrder();
} }
-2
View File
@@ -123,8 +123,6 @@ void ScreenSelectDifficulty::Init()
m_fLockInputTime = LOCK_INPUT_SECONDS; m_fLockInputTime = LOCK_INPUT_SECONDS;
this->UpdateSelectableChoices(); this->UpdateSelectableChoices();
this->SortByDrawOrder();
} }
void ScreenSelectDifficulty::BeginScreen() void ScreenSelectDifficulty::BeginScreen()
-2
View File
@@ -122,8 +122,6 @@ void ScreenSelectGroup::Init()
AfterChange(); AfterChange();
m_GroupList.SetSelection(0); m_GroupList.SetSelection(0);
this->SortByDrawOrder();
} }
-1
View File
@@ -129,7 +129,6 @@ void ScreenSelectStyle::Init()
SET_XY( m_sprPremium ); SET_XY( m_sprPremium );
// let AfterChange tween Picture and Info // let AfterChange tween Picture and Info
this->SortByDrawOrder();
} }
void ScreenSelectStyle::BeginScreen() void ScreenSelectStyle::BeginScreen()
-2
View File
@@ -76,8 +76,6 @@ void ScreenSetTime::Init()
m_TimeOffset = 0; m_TimeOffset = 0;
m_Selection = (SetTimeSelection)0; m_Selection = (SetTimeSelection)0;
ChangeSelection( 0 ); ChangeSelection( 0 );
this->SortByDrawOrder();
} }
void ScreenSetTime::Update( float fDelta ) void ScreenSetTime::Update( float fDelta )
-2
View File
@@ -24,8 +24,6 @@ void ScreenTestLights::Init()
m_textInputs.SetText( "" ); m_textInputs.SetText( "" );
SET_XY_AND_ON_COMMAND( m_textInputs ); SET_XY_AND_ON_COMMAND( m_textInputs );
this->AddChild( &m_textInputs ); this->AddChild( &m_textInputs );
this->SortByDrawOrder();
} }
-2
View File
@@ -37,8 +37,6 @@ void ScreenTitleMenu::Init()
{ {
ScreenSelectMaster::Init(); ScreenSelectMaster::Init();
this->SortByDrawOrder();
SOUND->PlayOnceFromAnnouncer( "title menu game name" ); SOUND->PlayOnceFromAnnouncer( "title menu game name" );
} }
-2
View File
@@ -34,8 +34,6 @@ void ScreenUnlockBrowse::Init()
m_banner.SetName( "Banner" ); m_banner.SetName( "Banner" );
this->AddChild( &m_banner ); this->AddChild( &m_banner );
this->SortByDrawOrder();
this->SubscribeToMessage( Message_MenuSelectionChanged ); this->SubscribeToMessage( Message_MenuSelectionChanged );
} }
-2
View File
@@ -309,8 +309,6 @@ void ScreenUnlockStatus::Init()
this->ClearMessageQueue( SM_BeginFadingOut ); // ignore ScreenAttract's SecsToShow this->ClearMessageQueue( SM_BeginFadingOut ); // ignore ScreenAttract's SecsToShow
this->PostScreenMessage( SM_BeginFadingOut, TIME_TO_DISPLAY ); this->PostScreenMessage( SM_BeginFadingOut, TIME_TO_DISPLAY );
this->SortByDrawOrder();
} }
ScreenUnlockStatus::~ScreenUnlockStatus() ScreenUnlockStatus::~ScreenUnlockStatus()