This commit is contained in:
Glenn Maynard
2005-09-09 04:12:28 +00:00
parent 0c4c4016e1
commit d7e567162e
+17 -17
View File
@@ -15,8 +15,8 @@
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "HighScore.h" #include "HighScore.h"
CString GRADE_X_NAME( size_t p ) { return ssprintf("GradeP%dX",int(p+1)); } static CString GRADE_X_NAME( size_t p ) { return ssprintf("GradeP%dX",int(p+1)); }
CString GRADE_Y_NAME( size_t p ) { return ssprintf("GradeP%dY",int(p+1)); } static CString GRADE_Y_NAME( size_t p ) { return ssprintf("GradeP%dY",int(p+1)); }
static ThemeMetric<float> ICON_X ("MusicWheelItem","IconX"); static ThemeMetric<float> ICON_X ("MusicWheelItem","IconX");
static ThemeMetric<float> ICON_Y ("MusicWheelItem","IconY"); static ThemeMetric<float> ICON_Y ("MusicWheelItem","IconY");
@@ -179,21 +179,21 @@ void MusicWheelItem::LoadFromWheelItemData( WheelItemData* pWID, bool bExpanded
BitmapText *bt = NULL; BitmapText *bt = NULL;
switch( pWID->m_Type ) switch( pWID->m_Type )
{ {
case TYPE_SECTION: case TYPE_SECTION:
sDisplayName = SONGMAN->ShortenGroupName(data->m_sText); sDisplayName = SONGMAN->ShortenGroupName(data->m_sText);
bt = &m_textSection; bt = &m_textSection;
break; break;
case TYPE_COURSE: case TYPE_COURSE:
sDisplayName = data->m_pCourse->GetDisplayFullTitle(); sDisplayName = data->m_pCourse->GetDisplayFullTitle();
sTranslitName = data->m_pCourse->GetTranslitFullTitle(); sTranslitName = data->m_pCourse->GetTranslitFullTitle();
bt = &m_textCourse; bt = &m_textCourse;
break; break;
case TYPE_SORT: case TYPE_SORT:
sDisplayName = data->m_sLabel; sDisplayName = data->m_sLabel;
bt = &m_textSort; bt = &m_textSort;
break; break;
default: default:
ASSERT(0); ASSERT(0);
} }
bt->SetText( sDisplayName, sTranslitName ); bt->SetText( sDisplayName, sTranslitName );