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

Readd course title, which appears to have fallen out at some point.

Browse Source 
Fix missing metrics.
This commit is contained in:
Glenn Maynard
2004-01-13 01:25:48 +00:00
parent a295e91e19
commit 723d1b1c6c
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenRanking.cpp
+23 -2
View File
@@ -99,6 +99,12 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
m_textCategory.SetHidden( true ); m_textCategory.SetHidden( true );
this->AddChild( &m_textCategory ); this->AddChild( &m_textCategory );
m_textCourseTitle.SetName( "CourseTitle" );
m_textCourseTitle.LoadFromFont( THEME->GetPathToF("ScreenRanking course title") );
m_textCourseTitle.EnableShadow( false );
m_textCourseTitle.SetHidden( true );
this->AddChild( &m_textCourseTitle );
m_textStepsType.SetName( "StepsType" ); m_textStepsType.SetName( "StepsType" );
m_textStepsType.LoadFromFont( THEME->GetPathToF("ScreenRanking steps type") ); m_textStepsType.LoadFromFont( THEME->GetPathToF("ScreenRanking steps type") );
m_textStepsType.EnableShadow( false ); m_textStepsType.EnableShadow( false );
@@ -318,6 +324,7 @@ float ScreenRanking::SetPage( PageToShow pts )
bool bBanner = false; bool bBanner = false;
bool bBannerFrame = false; bool bBannerFrame = false;
bool bShowCategory = false; bool bShowCategory = false;
bool bShowCourseTitle = false;
bool bShowStepsType = false; bool bShowStepsType = false;
bool bShowBullets = false; bool bShowBullets = false;
bool bShowNames = false; bool bShowNames = false;
@@ -332,6 +339,7 @@ float ScreenRanking::SetPage( PageToShow pts )
bBanner = false; bBanner = false;
bBannerFrame = false; bBannerFrame = false;
bShowCategory = true; bShowCategory = true;
bShowCourseTitle = false;
bShowStepsType = true; bShowStepsType = true;
bShowBullets = true; bShowBullets = true;
bShowNames = true; bShowNames = true;
@@ -345,6 +353,7 @@ float ScreenRanking::SetPage( PageToShow pts )
bBanner = true; bBanner = true;
bBannerFrame = true; bBannerFrame = true;
bShowCategory = false; bShowCategory = false;
bShowCourseTitle = true;
bShowStepsType = true; bShowStepsType = true;
bShowBullets = true; bShowBullets = true;
bShowNames = true; bShowNames = true;
@@ -358,6 +367,7 @@ float ScreenRanking::SetPage( PageToShow pts )
bBanner = false; bBanner = false;
bBannerFrame = false; bBannerFrame = false;
bShowCategory = false; bShowCategory = false;
bShowCourseTitle = false;
bShowStepsType = true; bShowStepsType = true;
bShowBullets = false; bShowBullets = false;
bShowNames = false; bShowNames = false;
@@ -394,6 +404,13 @@ float ScreenRanking::SetPage( PageToShow pts )
SET_XY_AND_ON_COMMAND( m_textCategory ); SET_XY_AND_ON_COMMAND( m_textCategory );
} }
m_textCourseTitle.SetHidden( !bShowCourseTitle );
if( bShowCourseTitle )
{
m_textCourseTitle.Reset();
SET_XY_AND_ON_COMMAND( m_textCourseTitle );
}
m_textStepsType.SetHidden( !bShowStepsType ); m_textStepsType.SetHidden( !bShowStepsType );
if( bShowStepsType ) if( bShowStepsType )
{ {
@@ -553,6 +570,7 @@ float ScreenRanking::SetPage( PageToShow pts )
return SECONDS_PER_PAGE; return SECONDS_PER_PAGE;
case PageToShow::TYPE_COURSE: case PageToShow::TYPE_COURSE:
{ {
m_textCourseTitle.SetText( pts.pCourse->m_sName );
m_Banner.LoadFromCourse( pts.pCourse ); m_Banner.LoadFromCourse( pts.pCourse );
m_textStepsType.SetText( GameManager::NotesTypeToString(pts.nt) ); m_textStepsType.SetText( GameManager::NotesTypeToString(pts.nt) );
@@ -659,6 +677,7 @@ void ScreenRanking::TweenPageOffScreen()
{ {
OFF_COMMAND( m_Banner ); OFF_COMMAND( m_Banner );
OFF_COMMAND( m_sprBannerFrame ); OFF_COMMAND( m_sprBannerFrame );
OFF_COMMAND( m_textCourseTitle );
OFF_COMMAND( m_textCategory ); OFF_COMMAND( m_textCategory );
OFF_COMMAND( m_textStepsType ); OFF_COMMAND( m_textStepsType );
@@ -673,11 +692,13 @@ void ScreenRanking::TweenPageOffScreen()
const unsigned num_songs = SONGMAN->GetAllSongs().size(); const unsigned num_songs = SONGMAN->GetAllSongs().size();
for( vector<Difficulty>::iterator dc_iter=m_vDiffsToShow.begin(); dc_iter!=m_vDiffsToShow.end(); dc_iter++ ) for( vector<Difficulty>::iterator dc_iter=m_vDiffsToShow.begin(); dc_iter!=m_vDiffsToShow.end(); dc_iter++ )
{ {
OFF_COMMAND( m_sprDifficulty[*dc_iter] ); if( !m_sprDifficulty[*dc_iter].GetHidden() )
OFF_COMMAND( m_sprDifficulty[*dc_iter] );
for( unsigned s=0; s<num_songs; s++ ) for( unsigned s=0; s<num_songs; s++ )
{ {
// m_vpTextStepsScore[*dc_iter][s]; // m_vpTextStepsScore[*dc_iter][s];
} }
} }
OFF_COMMAND( m_ListScoreRowItems ); if( !m_ListScoreRowItems.GetHidden() )
OFF_COMMAND( m_ListScoreRowItems );
} }
stepmania/src/ScreenRanking.h
+1
View File
@@ -47,6 +47,7 @@ protected:
Banner m_Banner; // for course Banner m_Banner; // for course
Sprite m_sprBannerFrame; // for course Sprite m_sprBannerFrame; // for course
BitmapText m_textCourseTitle; // for course
BitmapText m_textCategory; // for category BitmapText m_textCategory; // for category
BitmapText m_textStepsType; // for category, course, all_steps BitmapText m_textStepsType; // for category, course, all_steps