This commit is contained in:
Glenn Maynard
2006-08-17 02:08:38 +00:00
parent 3168775fe6
commit c351e14aa5
+16 -17
View File
@@ -1031,30 +1031,29 @@ void ScreenSelectMusic::AfterMusicChange()
break; break;
case TYPE_SONG: case TYPE_SONG:
case TYPE_PORTAL: case TYPE_PORTAL:
{ m_sSampleMusicToPlay = pSong->GetMusicPath();
m_sSampleMusicToPlay = pSong->GetMusicPath(); m_pSampleMusicTimingData = &pSong->m_Timing;
m_pSampleMusicTimingData = &pSong->m_Timing; m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds;
m_fSampleStartSeconds = pSong->m_fMusicSampleStartSeconds; m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds;
m_fSampleLengthSeconds = pSong->m_fMusicSampleLengthSeconds;
m_textNumSongs.SetText( ssprintf("%d", SongManager::GetNumStagesForSong(pSong) ) ); m_textNumSongs.SetText( ssprintf("%d", SongManager::GetNumStagesForSong(pSong) ) );
m_textTotalTime.SetText( SecondsToMMSSMsMs(pSong->m_fMusicLengthSeconds) ); m_textTotalTime.SetText( SecondsToMMSSMsMs(pSong->m_fMusicLengthSeconds) );
SongUtil::GetSteps( pSong, m_vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType ); SongUtil::GetSteps( pSong, m_vpSteps, GAMESTATE->GetCurrentStyle()->m_StepsType );
StepsUtil::RemoveLockedSteps( pSong, m_vpSteps ); StepsUtil::RemoveLockedSteps( pSong, m_vpSteps );
StepsUtil::SortNotesArrayByDifficulty( m_vpSteps ); StepsUtil::SortNotesArrayByDifficulty( m_vpSteps );
if ( PREFSMAN->m_bShowBanners ) if ( PREFSMAN->m_bShowBanners )
g_sBannerPath = pSong->GetBannerPath(); g_sBannerPath = pSong->GetBannerPath();
g_sCDTitlePath = pSong->GetCDTitlePath(); g_sCDTitlePath = pSong->GetCDTitlePath();
g_bWantFallbackCdTitle = true; g_bWantFallbackCdTitle = true;
m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType ); m_DifficultyDisplay.SetDifficulties( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType );
SwitchToPreferredDifficulty(); SwitchToPreferredDifficulty();
}
break; break;
case TYPE_COURSE: case TYPE_COURSE:
{ {
Course* pCourse = m_MusicWheel.GetSelectedCourse(); Course* pCourse = m_MusicWheel.GetSelectedCourse();