Fixed MusicSort icon not showing

This commit is contained in:
Chris Danford
2002-10-07 07:16:40 +00:00
parent f4ef92ab81
commit fcb66151b0
2 changed files with 4 additions and 9 deletions
+1 -1
View File
@@ -188,7 +188,7 @@ void WheelItemDisplay::RefreshGrades()
if( m_pSong == GAMESTATE->m_pCurSong )
{
Notes* pNotes = GAMESTATE->m_pCurNotes[p];
m_GradeDisplay[p].SetGrade( (PlayerNumber)p, pNotes->m_TopGrade );
m_GradeDisplay[p].SetGrade( (PlayerNumber)p, pNotes ? pNotes->m_TopGrade : GRADE_NO_DATA );
}
else
{
+3 -8
View File
@@ -212,7 +212,6 @@ ScreenSelectMusic::ScreenSelectMusic()
}
m_MusicSortDisplay.SetXY( SORT_ICON_X, SORT_ICON_Y );
//m_MusicSortDisplay.SetEffectGlowing( 1.0f );
m_MusicSortDisplay.Set( GAMESTATE->m_SongSortOrder );
this->AddChild( &m_MusicSortDisplay );
@@ -443,8 +442,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, const InputEventType
{
MUSIC->Stop();
m_MusicSortDisplay.BeginTweening( 0.3f );
m_MusicSortDisplay.SetTweenDiffuse( D3DXCOLOR(1,1,1,0) );
// m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
TweenScoreOnAndOffAfterChangeSort();
}
@@ -578,8 +576,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
{
MUSIC->Stop();
m_MusicSortDisplay.BeginTweening( 0.3f );
m_MusicSortDisplay.SetTweenDiffuse( D3DXCOLOR(1,1,1,0) );
// m_MusicSortDisplay.FadeOff( 0, "fade", TWEEN_TIME );
TweenScoreOnAndOffAfterChangeSort();
}
@@ -817,8 +814,6 @@ void ScreenSelectMusic::SortOrderChanged()
m_MusicSortDisplay.SetState( GAMESTATE->m_SongSortOrder );
// tween music sort on screen
// m_MusicSortDisplay.SetEffectGlowing();
m_MusicSortDisplay.BeginTweening( 0.3f );
m_MusicSortDisplay.SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );
// m_MusicSortDisplay.FadeOn( 0, "fade", TWEEN_TIME );
}