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

Cleanup.

Browse Source
This commit is contained in:
Steve Checkoway
2006-12-12 12:11:24 +00:00
parent eab92a7ded
commit ebbd138a76
1 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheelItem.cpp
+42 -44
View File
@@ -177,46 +177,43 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
case TYPE_SECTION: case TYPE_SECTION:
case TYPE_COURSE: case TYPE_COURSE:
case TYPE_SORT: case TYPE_SORT:
{
RString sDisplayName, sTranslitName;
BitmapText *bt = NULL;
switch( pWID->m_Type )
{ {
RString sDisplayName, sTranslitName; case TYPE_SECTION:
BitmapText *bt = NULL; sDisplayName = SONGMAN->ShortenGroupName(data->m_sText);
switch( pWID->m_Type ) bt = &m_textSection;
{ break;
case TYPE_SECTION: case TYPE_COURSE:
sDisplayName = SONGMAN->ShortenGroupName(data->m_sText); sDisplayName = data->m_pCourse->GetDisplayFullTitle();
bt = &m_textSection; sTranslitName = data->m_pCourse->GetTranslitFullTitle();
break; bt = &m_textCourse;
case TYPE_COURSE:
sDisplayName = data->m_pCourse->GetDisplayFullTitle();
sTranslitName = data->m_pCourse->GetTranslitFullTitle();
bt = &m_textCourse;
m_WheelNotifyIcon.SetFlags( data->m_Flags );
m_WheelNotifyIcon.SetHidden( false );
break;
case TYPE_SORT:
sDisplayName = data->m_sLabel;
bt = &m_textSort;
break;
default:
ASSERT(0);
}
bt->SetText( sDisplayName, sTranslitName );
bt->SetDiffuse( data->m_color );
bt->SetRainbow( false );
bt->SetHidden( false );
}
break;
case TYPE_SONG:
{
m_TextBanner.LoadFromSong( data->m_pSong );
m_TextBanner.SetDiffuse( data->m_color );
m_TextBanner.SetHidden( false );
m_WheelNotifyIcon.SetFlags( data->m_Flags ); m_WheelNotifyIcon.SetFlags( data->m_Flags );
m_WheelNotifyIcon.SetHidden( false ); m_WheelNotifyIcon.SetHidden( false );
RefreshGrades(); break;
case TYPE_SORT:
sDisplayName = data->m_sLabel;
bt = &m_textSort;
break;
DEFAULT_FAIL( pWID->m_Type );
} }
bt->SetText( sDisplayName, sTranslitName );
bt->SetDiffuse( data->m_color );
bt->SetRainbow( false );
bt->SetHidden( false );
break;
}
case TYPE_SONG:
m_TextBanner.LoadFromSong( data->m_pSong );
m_TextBanner.SetDiffuse( data->m_color );
m_TextBanner.SetHidden( false );
m_WheelNotifyIcon.SetFlags( data->m_Flags );
m_WheelNotifyIcon.SetHidden( false );
RefreshGrades();
break; break;
case TYPE_ROULETTE: case TYPE_ROULETTE:
m_textRoulette.SetText( THEME->GetString("MusicWheel","Roulette") ); m_textRoulette.SetText( THEME->GetString("MusicWheel","Roulette") );
@@ -233,8 +230,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
m_textRoulette.SetHidden( false ); m_textRoulette.SetHidden( false );
break; break;
default: DEFAULT_FAIL( pWID->m_Type ); // invalid type
ASSERT( 0 ); // invalid type
} }
Actor *pBars[] = { m_sprBar, m_sprExpandedBar, m_sprSectionBar, m_sprModeBar, m_sprSortBar, m_sprSongBar, NULL }; Actor *pBars[] = { m_sprBar, m_sprExpandedBar, m_sprSectionBar, m_sprModeBar, m_sprSortBar, m_sprSongBar, NULL };
@@ -262,7 +258,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pWIBD, int
case TYPE_COURSE: case TYPE_COURSE:
m_sprSongBar->SetHidden( false ); m_sprSongBar->SetHidden( false );
break; break;
default: ASSERT(0); DEFAULT_FAIL( data->m_Type );
} }
for( unsigned i = 0; pBars[i] != NULL; ++i ) for( unsigned i = 0; pBars[i] != NULL; ++i )
@@ -320,12 +316,14 @@ void MusicWheelItem::RefreshGrades()
void MusicWheelItem::HandleMessage( const Message &msg ) void MusicWheelItem::HandleMessage( const Message &msg )
{ {
if( msg == Message_CurrentStepsP1Changed || if( msg == Message_CurrentStepsP1Changed ||
msg == Message_CurrentStepsP2Changed || msg == Message_CurrentStepsP2Changed ||
msg == Message_CurrentTrailP1Changed || msg == Message_CurrentTrailP1Changed ||
msg == Message_CurrentTrailP2Changed || msg == Message_CurrentTrailP2Changed ||
msg == Message_PreferredDifficultyP1Changed || msg == Message_PreferredDifficultyP1Changed ||
msg == Message_PreferredDifficultyP2Changed ) msg == Message_PreferredDifficultyP2Changed )
{
RefreshGrades(); RefreshGrades();
}
Actor::HandleMessage( msg ); Actor::HandleMessage( msg );
} }