[FadingBanner] Added BannerRoulette, BannerRandom, and Banner(Custom Item Name) commands.

Docs/Changelog_sm-ssc.txt

@@ -17,6 +17,7 @@ sm-ssc v1.2.5 | 201104??
 --------
 * [Banner] Added ScrollSpeedDivisor metric; controls the scroll speed of
   Random/Roulette banners. [AJ]
+* [FadingBanner] Added BannerRoulette, BannerRandom, and Banner(Custom Item Name) commands. [AJ]
 
 20110421
 --------

Themes/_fallback/metrics.ini

@@ -496,6 +496,9 @@ BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0
 # ?
 BannerResetFadeCommand=diffusealpha,1
 
+BannerRouletteCommand=
+BannerRandomCommand=
+
 [Gameplay]
 # System Direction
 ComboIsPerRow=ComboPerRow()

src/FadingBanner.cpp

@@ -226,12 +226,14 @@ void FadingBanner::LoadRoulette()
 {
 	BeforeChange();
 	m_Banner[m_iIndexLatest].LoadRoulette();
+	m_Banner[m_iIndexLatest].PlayCommand( "Roulette" );
 }
 
 void FadingBanner::LoadRandom()
 {
 	BeforeChange();
 	m_Banner[m_iIndexLatest].LoadRandom();
+	m_Banner[m_iIndexLatest].PlayCommand( "Random" );
 }
 
 void FadingBanner::LoadFromSortOrder( SortOrder so )
@@ -252,6 +254,13 @@ void FadingBanner::LoadCourseFallback()
 	m_Banner[m_iIndexLatest].LoadCourseFallback();
 }
 
+void FadingBanner::LoadCustom( RString sBanner )
+{
+	BeforeChange();
+	m_Banner[m_iIndexLatest].Load( THEME->GetPathG( "Banner", sBanner ) );
+	m_Banner[m_iIndexLatest].PlayCommand( sBanner );
+}
+
 // lua start
 #include "LuaBinding.h"
 

src/FadingBanner.h

@@ -29,6 +29,7 @@ public:
 	void LoadFromSortOrder( SortOrder so );
 	void LoadFallback();
 	void LoadCourseFallback();
+	void LoadCustom( RString sBanner );
 
 	bool LoadFromCachedBanner( const RString &path );
 	bool LoadFromCachedBackground( const RString &path );

src/ScreenSelectMusic.cpp

@@ -1722,10 +1722,13 @@ void ScreenSelectMusic::AfterMusicChange()
 				m_sSampleMusicToPlay = m_sRandomMusicPath;
 				break;
 			case TYPE_CUSTOM:
-				bWantBanner = false; // we load it ourself, or should
+				{
-				m_Banner.Load( THEME->GetPathG( "Banner", GetMusicWheel()->GetCurWheelItemData( GetMusicWheel()->GetCurrentIndex() )->m_pAction->m_sName.c_str() ) );
+					bWantBanner = false; // we load it ourself
-				if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
+					RString sBannerName = GetMusicWheel()->GetCurWheelItemData( GetMusicWheel()->GetCurrentIndex() )->m_pAction->m_sName.c_str();
-					m_sSampleMusicToPlay = m_sSectionMusicPath;
+					m_Banner.LoadCustom(sBannerName);
+					if( SAMPLE_MUSIC_PREVIEW_MODE != SampleMusicPreviewMode_LastSong )
+						m_sSampleMusicToPlay = m_sSectionMusicPath;
+				}
 				break;
 			default:
 				ASSERT(0);