From 47f88599e7bb3138515df2aef82f9a240f0f2f37 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 3 Jan 2003 03:40:39 +0000 Subject: [PATCH] minor fixes --- stepmania/src/ScreenSelectMusic.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 5cc11699f2..0503230ec7 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -716,7 +716,8 @@ void ScreenSelectMusic::AfterMusicChange() * XXX: When we're not changing banners and not rouletting, show some * kind of "moving fast" fallback banner. (When rouletting, just keep * showing the roulette banner.) */ - if(m_MusicWheel.IsRouletting() || !PREFSMAN->m_bChangeBannersWhenFast) + if(m_MusicWheel.IsRouletting() || + (m_MusicWheel.IsMoving() && !PREFSMAN->m_bChangeBannersWhenFast)) no_banner_change = true; } @@ -790,7 +791,6 @@ void ScreenSelectMusic::AfterMusicChange() m_fPlaySampleCountdown = 0; } - void ScreenSelectMusic::PlayMusicSample() { //LOG->Trace( "ScreenSelectSong::PlayMusicSample()" ); @@ -831,7 +831,7 @@ void ScreenSelectMusic::UpdateOptionsDisplays() void ScreenSelectMusic::SortOrderChanged() { - m_MusicSortDisplay.SetState( GAMESTATE->m_SongSortOrder ); + m_MusicSortDisplay.Set( GAMESTATE->m_SongSortOrder ); // tween music sort on screen // m_MusicSortDisplay.FadeOn( 0, "fade", TWEEN_TIME );