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

add per-screen CourseDifficultiesToShow instead of using global

Browse Source
This commit is contained in:
Chris Danford
2005-05-08 04:01:01 +00:00
parent 27edb1f2bb
commit 771979de6f
2 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenRanking.cpp
+33 -38
View File
@@ -98,6 +98,7 @@ REGISTER_SCREEN_CLASS( ScreenRanking );
ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ), ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ),
STEPS_TYPES_TO_SHOW (m_sName,"StepsTypesToHide"), STEPS_TYPES_TO_SHOW (m_sName,"StepsTypesToHide"),
DIFFICULTIES_TO_SHOW (m_sName,"DifficultiesToShow"), DIFFICULTIES_TO_SHOW (m_sName,"DifficultiesToShow"),
COURSE_DIFFICULTIES_TO_SHOW (m_sName,"CourseDifficultiesToShow"),
SHOW_CATEGORIES (m_sName,"ShowCategories"), SHOW_CATEGORIES (m_sName,"ShowCategories"),
SHOW_STEPS_SCORES (m_sName,"ShowStepsScores"), SHOW_STEPS_SCORES (m_sName,"ShowStepsScores"),
@@ -256,27 +257,21 @@ void ScreenRanking::Init()
} }
const vector<Difficulty> &v = DIFFICULTIES_TO_SHOW.GetValue(); FOREACH_CONST( Difficulty, DIFFICULTIES_TO_SHOW.GetValue(), d )
FOREACH_Difficulty( d )
{ {
bool bShowThis = find( v.begin(), v.end(), d ) != v.end(); m_sprDifficulty[*d].Load( THEME->GetPathG(m_sName,"difficulty "+DifficultyToString(*d)) );
if( !bShowThis ) m_sprDifficulty[*d]->SetName( ssprintf("Difficulty%d",(*d)+1) );
continue; // skip m_sprDifficulty[*d]->SetHidden( true );
this->AddChild( m_sprDifficulty[*d] );
m_sprDifficulty[d].Load( THEME->GetPathG(m_sName,"difficulty "+DifficultyToString(d)) );
m_sprDifficulty[d]->SetName( ssprintf("Difficulty%d",d) );
m_sprDifficulty[d]->SetHidden( true );
this->AddChild( m_sprDifficulty[d] );
} }
FOREACH_ShownCourseDifficulty(d) FOREACH_CONST( CourseDifficulty, COURSE_DIFFICULTIES_TO_SHOW.GetValue(), cd )
{ {
CString cd = CourseDifficultyToString(d); m_sprCourseDifficulty[*cd].Load( THEME->GetPathG(m_sName,"CourseDifficulty "+CourseDifficultyToString(*cd)) );
m_sprCourseDifficulty[d].Load( THEME->GetPathG(m_sName,"CourseDifficulty "+cd) ); m_sprCourseDifficulty[*cd]->SetName( "CourseDifficulty"+CourseDifficultyToString(*cd) );
m_sprCourseDifficulty[d]->SetName( ssprintf("CourseDifficulty%s",cd.c_str()) ); m_sprCourseDifficulty[*cd]->SetHidden( true );
m_sprCourseDifficulty[d]->SetHidden( true ); this->AddChild( m_sprCourseDifficulty[*cd] );
this->AddChild( m_sprCourseDifficulty[d] );
} }
@@ -362,12 +357,12 @@ void ScreenRanking::Init()
item.m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"course list title") ); item.m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"course list title") );
item.AddChild( &item.m_textTitle ); item.AddChild( &item.m_textTitle );
FOREACH_ShownCourseDifficulty(d) FOREACH_CONST( CourseDifficulty, COURSE_DIFFICULTIES_TO_SHOW.GetValue(), cd )
{ {
item.m_textScore[d].SetName( "CourseListScore" ); item.m_textScore[*cd].SetName( "CourseListScore" );
item.m_textScore[d].LoadFromFont( THEME->GetPathF(m_sName,"course list score") ); item.m_textScore[*cd].LoadFromFont( THEME->GetPathF(m_sName,"course list score") );
item.m_textScore[d].SetHidden( true ); item.m_textScore[*cd].SetHidden( true );
item.AddChild( &item.m_textScore[d] ); item.AddChild( &item.m_textScore[*cd] );
} }
} }
@@ -691,14 +686,14 @@ float ScreenRanking::SetPage( PageToShow pts )
} }
} }
FOREACH_ShownCourseDifficulty(d) FOREACH_CONST( CourseDifficulty, COURSE_DIFFICULTIES_TO_SHOW.GetValue(), cd )
{ {
m_sprCourseDifficulty[d]->SetHidden( !bShowCourseDifficulty ); m_sprCourseDifficulty[*cd]->SetHidden( !bShowCourseDifficulty );
if( bShowCourseDifficulty ) if( bShowCourseDifficulty )
{ {
m_sprCourseDifficulty[d]->Reset(); m_sprCourseDifficulty[*cd]->Reset();
m_sprCourseDifficulty[d]->SetXY( COURSE_DIFFICULTY_X(d), COURSE_DIFFICULTY_Y ); m_sprCourseDifficulty[*cd]->SetXY( COURSE_DIFFICULTY_X(*cd), COURSE_DIFFICULTY_Y );
ON_COMMAND( m_sprCourseDifficulty[d] ); ON_COMMAND( m_sprCourseDifficulty[*cd] );
} }
} }
@@ -730,13 +725,13 @@ float ScreenRanking::SetPage( PageToShow pts )
item.m_textTitle.SetUseZBuffer( true ); item.m_textTitle.SetUseZBuffer( true );
ON_COMMAND( item.m_textTitle ); ON_COMMAND( item.m_textTitle );
FOREACH_ShownCourseDifficulty(d) FOREACH_CONST( CourseDifficulty, COURSE_DIFFICULTIES_TO_SHOW.GetValue(), cd )
{ {
item.m_textScore[d].Reset(); item.m_textScore[*cd].Reset();
item.m_textScore[d].SetXY( COURSE_SCORE_OFFSET_X(d), COURSE_SCORE_OFFSET_Y ); item.m_textScore[*cd].SetXY( COURSE_SCORE_OFFSET_X(*cd), COURSE_SCORE_OFFSET_Y );
item.m_textScore[d].SetUseZBuffer( true ); item.m_textScore[*cd].SetUseZBuffer( true );
item.m_textScore[d].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); item.m_textScore[*cd].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
ON_COMMAND( item.m_textScore[d] ); ON_COMMAND( item.m_textScore[*cd] );
} }
} }
} }
@@ -894,11 +889,11 @@ float ScreenRanking::SetPage( PageToShow pts )
const Course* pCourse = item.m_pCourse; const Course* pCourse = item.m_pCourse;
item.m_textTitle.SetText( pCourse->GetFullDisplayTitle() ); item.m_textTitle.SetText( pCourse->GetFullDisplayTitle() );
FOREACH_ShownCourseDifficulty( cd ) FOREACH_CONST( CourseDifficulty, COURSE_DIFFICULTIES_TO_SHOW.GetValue(), cd )
{ {
BitmapText* pTextStepsScore = &item.m_textScore[cd]; BitmapText* pTextStepsScore = &item.m_textScore[*cd];
Trail *pTrail = pCourse->GetTrail( pts.st, cd ); Trail *pTrail = pCourse->GetTrail( pts.st, *cd );
pTextStepsScore->SetHidden( pTrail==NULL ); pTextStepsScore->SetHidden( pTrail==NULL );
if( pTrail == NULL ) if( pTrail == NULL )
continue; continue;
@@ -952,10 +947,10 @@ void ScreenRanking::TweenPageOffScreen()
if( !m_sprDifficulty[*iter]->GetHidden() ) if( !m_sprDifficulty[*iter]->GetHidden() )
OFF_COMMAND( m_sprDifficulty[*iter] ); OFF_COMMAND( m_sprDifficulty[*iter] );
} }
FOREACH_ShownCourseDifficulty(d) FOREACH_CONST( CourseDifficulty, COURSE_DIFFICULTIES_TO_SHOW.GetValue(), cd )
{ {
if( !m_sprCourseDifficulty[d]->GetHidden() ) if( !m_sprCourseDifficulty[*cd]->GetHidden() )
OFF_COMMAND( m_sprCourseDifficulty[d] ); OFF_COMMAND( m_sprCourseDifficulty[*cd] );
} }
if( !m_ListScoreRowItems.GetHidden() ) if( !m_ListScoreRowItems.GetHidden() )
stepmania/src/ScreenRanking.h
+1
View File
@@ -105,6 +105,7 @@ protected:
// ranking screens that want to show different types and difficulties. // ranking screens that want to show different types and difficulties.
ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW; ThemeMetricStepsTypesToShow STEPS_TYPES_TO_SHOW;
ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW; ThemeMetricDifficultiesToShow DIFFICULTIES_TO_SHOW;
ThemeMetricCourseDifficultiesToShow COURSE_DIFFICULTIES_TO_SHOW;
ThemeMetric<bool> SHOW_CATEGORIES; ThemeMetric<bool> SHOW_CATEGORIES;
ThemeMetric<bool> SHOW_STEPS_SCORES; ThemeMetric<bool> SHOW_STEPS_SCORES;