actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't load commands in BeginScreen

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-01 21:20:14 +00:00
parent 246cc2f88a
commit 50bed80184
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenRanking.cpp
+8 -4
View File
@@ -417,6 +417,7 @@ void ScreenRankingScroller::Init()
} }
m_ListScoreRowItems.SetName( "ListScoreRowItems" ); m_ListScoreRowItems.SetName( "ListScoreRowItems" );
LOAD_ALL_COMMANDS( m_ListScoreRowItems );
switch( m_PageType ) switch( m_PageType )
{ {
default: ASSERT(0); default: ASSERT(0);
@@ -461,7 +462,7 @@ void ScreenRankingScroller::BeginScreen()
{ {
ScreenRanking::BeginScreen(); ScreenRanking::BeginScreen();
LOAD_ALL_COMMANDS_AND_SET_XY( m_ListScoreRowItems ); SET_XY( m_ListScoreRowItems );
} }
void ScoreScroller::SetScoreFromHighScoreList( BitmapText *pTextStepsScore, const HighScoreList &hsl ) void ScoreScroller::SetScoreFromHighScoreList( BitmapText *pTextStepsScore, const HighScoreList &hsl )
@@ -533,6 +534,7 @@ void ScreenRankingLines::Init()
m_textCategory.LoadFromFont( THEME->GetPathF(m_sName,"category") ); m_textCategory.LoadFromFont( THEME->GetPathF(m_sName,"category") );
m_textCategory.SetShadowLength( 0 ); m_textCategory.SetShadowLength( 0 );
this->AddChild( &m_textCategory ); this->AddChild( &m_textCategory );
LOAD_ALL_COMMANDS( m_textCategory );
for( unsigned i=0; i<STEPS_TYPES_TO_SHOW.GetValue().size(); i++ ) for( unsigned i=0; i<STEPS_TYPES_TO_SHOW.GetValue().size(); i++ )
{ {
@@ -551,11 +553,13 @@ void ScreenRankingLines::Init()
{ {
m_Banner.SetName( "Banner" ); m_Banner.SetName( "Banner" );
this->AddChild( &m_Banner ); this->AddChild( &m_Banner );
LOAD_ALL_COMMANDS( m_Banner );
m_textCourseTitle.SetName( "CourseTitle" ); m_textCourseTitle.SetName( "CourseTitle" );
m_textCourseTitle.LoadFromFont( THEME->GetPathF(m_sName,"course title") ); m_textCourseTitle.LoadFromFont( THEME->GetPathF(m_sName,"course title") );
m_textCourseTitle.SetShadowLength( 0 ); m_textCourseTitle.SetShadowLength( 0 );
this->AddChild( &m_textCourseTitle ); this->AddChild( &m_textCourseTitle );
LOAD_ALL_COMMANDS( m_textCourseTitle );
vector<RString> asCoursePaths; vector<RString> asCoursePaths;
split( COURSES_TO_SHOW, ",", asCoursePaths, true ); split( COURSES_TO_SHOW, ",", asCoursePaths, true );
@@ -750,12 +754,12 @@ float ScreenRankingLines::SetPage( const PageToShow &pts )
void ScreenRankingLines::BeginScreen() void ScreenRankingLines::BeginScreen()
{ {
if( m_PageType == PageType_Category ) if( m_PageType == PageType_Category )
LOAD_ALL_COMMANDS_AND_SET_XY( m_textCategory ); SET_XY( m_textCategory );
if( m_PageType == PageType_Trail ) if( m_PageType == PageType_Trail )
{ {
LOAD_ALL_COMMANDS_AND_SET_XY( m_Banner ); SET_XY( m_Banner );
LOAD_ALL_COMMANDS_AND_SET_XY( m_textCourseTitle ); SET_XY( m_textCourseTitle );
} }
ScreenRanking::BeginScreen(); ScreenRanking::BeginScreen();