From b5129ac163f19d74947a51974bae104dcdc0ff26 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 14 May 2011 19:53:57 -0500 Subject: [PATCH] [Banner] Added ScrollMode and ScrollSortOrder metrics. --- Docs/Changelog_sm5.txt | 1 + Themes/_fallback/metrics.ini | 2 ++ src/Banner.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 94335c16d0..605c20658e 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -12,6 +12,7 @@ StepMania 5.0 $NEXT | 20110xyy ---------- * [MusicWheel] Added ShowSectionsInBPMSort and ShowSectionsInLengthSort metrics. [AJ] * [ScreenEvaluation] Stop the Bonus bars from overflowing in course modes. [AJ] +* [Banner] Added ScrollMode and ScrollSortOrder metrics. [AJ] 2011/05/11 ---------- diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index cd36f351cc..f804a18e50 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -220,6 +220,8 @@ BottomEdge=SCREEN_BOTTOM # Scroll stuff when you roll over it, DDR Extreme style. ScrollRandom=false ScrollRoulette=false +ScrollMode=false +ScrollScrollOrder=false # Control how fast the banner scrolls. Higher numbers mean slower. ScrollSpeedDivisor=2 diff --git a/src/Banner.cpp b/src/Banner.cpp index b8d115e206..f78777d73d 100644 --- a/src/Banner.cpp +++ b/src/Banner.cpp @@ -17,8 +17,8 @@ REGISTER_ACTOR_CLASS( Banner ); ThemeMetric SCROLL_RANDOM ("Banner","ScrollRandom"); ThemeMetric SCROLL_ROULETTE ("Banner","ScrollRoulette"); -//ThemeMetric SCROLL_MODE ("Banner","ScrollMode"); -//ThemeMetric SCROLL_SORT_ORDER ("Banner","ScrollSortOrder"); +ThemeMetric SCROLL_MODE ("Banner","ScrollMode"); +ThemeMetric SCROLL_SORT_ORDER ("Banner","ScrollSortOrder"); ThemeMetric SCROLL_SPEED_DIVISOR ("Banner","ScrollSpeedDivisor"); Banner::Banner() @@ -119,7 +119,7 @@ void Banner::LoadFromSong( Song* pSong ) // NULL means no song void Banner::LoadMode() { Load( THEME->GetPathG("Banner","Mode") ); - m_bScrolling = false; + m_bScrolling = (bool)SCROLL_MODE; } void Banner::LoadFromSongGroup( RString sSongGroup ) @@ -229,7 +229,7 @@ void Banner::LoadFromSortOrder( SortOrder so ) if( so != SORT_GROUP && so != SORT_RECENT ) Load( THEME->GetPathG("Banner",ssprintf("%s",SortOrderToString(so).c_str())) ); } - m_bScrolling = false; + m_bScrolling = (bool)SCROLL_SORT_ORDER; } // lua start