metric name cleanup

This commit is contained in:
Chris Danford
2004-01-25 05:34:46 +00:00
parent ebb7c2b81e
commit 7744d4a36d
+3 -16
View File
@@ -388,12 +388,6 @@ RageColor SongManager::GetSongColor( const Song* pSong )
return GetGroupColor( pSong->m_sGroupName ); return GetGroupColor( pSong->m_sGroupName );
} }
#define BEGINNER_DESCRIPTION THEME->GetMetric ("Common","Beginner")
#define EASY_DESCRIPTION THEME->GetMetric ("Common","Easy")
#define MEDIUM_DESCRIPTION THEME->GetMetric ("Common","Medium")
#define HARD_DESCRIPTION THEME->GetMetric ("Common","Hard")
#define CHALLENGE_DESCRIPTION THEME->GetMetric ("Common","Challenge")
RageColor SongManager::GetDifficultyColor( Difficulty dc ) const RageColor SongManager::GetDifficultyColor( Difficulty dc ) const
{ {
switch( dc ) switch( dc )
@@ -403,21 +397,14 @@ RageColor SongManager::GetDifficultyColor( Difficulty dc ) const
case DIFFICULTY_MEDIUM: return MEDIUM_COLOR; case DIFFICULTY_MEDIUM: return MEDIUM_COLOR;
case DIFFICULTY_HARD: return HARD_COLOR; case DIFFICULTY_HARD: return HARD_COLOR;
case DIFFICULTY_CHALLENGE: return CHALLENGE_COLOR; case DIFFICULTY_CHALLENGE: return CHALLENGE_COLOR;
default: ASSERT(0); return CHALLENGE_COLOR; default: ASSERT(0); return CHALLENGE_COLOR;
} }
} }
CString SongManager::GetDifficultyThemeName( Difficulty dc ) const CString SongManager::GetDifficultyThemeName( Difficulty dc ) const
{ {
switch( dc ) CString sMetricName = "Difficulty" + Capitalize( DifficultyToString(dc) );
{ return THEME->GetMetric( "Common", sMetricName );
case DIFFICULTY_BEGINNER: return BEGINNER_DESCRIPTION;
case DIFFICULTY_EASY: return EASY_DESCRIPTION;
case DIFFICULTY_MEDIUM: return MEDIUM_DESCRIPTION;
case DIFFICULTY_HARD: return HARD_DESCRIPTION;
case DIFFICULTY_CHALLENGE: return CHALLENGE_DESCRIPTION;
default: ASSERT(0); return ""; // something else
}
} }
void SongManager::GetSongs( vector<Song*> &AddTo, CString sGroupName, int iMaxStages ) const void SongManager::GetSongs( vector<Song*> &AddTo, CString sGroupName, int iMaxStages ) const