diff --git a/stepmania/src/Banner.cpp b/stepmania/src/Banner.cpp index d95091ea03..baf74d55a4 100644 --- a/stepmania/src/Banner.cpp +++ b/stepmania/src/Banner.cpp @@ -53,6 +53,15 @@ void Banner::Update( float fDeltaTime ) } } +void Banner::SetScrolling( bool bScroll, float Percent) +{ + m_bScrolling = bScroll; + m_fPercentScrolling = Percent; + + /* Set up the texture coord rects for the current state. */ + Update(0); +} + bool Banner::LoadFromSong( Song* pSong ) // NULL means no song { m_bScrolling = false; diff --git a/stepmania/src/Banner.h b/stepmania/src/Banner.h index 7d1be096bd..ae6019a13b 100644 --- a/stepmania/src/Banner.h +++ b/stepmania/src/Banner.h @@ -31,8 +31,9 @@ public: bool LoadFromCourse( Course* pCourse ); bool LoadRoulette(); - inline void SetScrolling( bool bScroll ) { m_bScrolling = bScroll; }; - inline bool IsScrolling() { return m_bScrolling; }; + void SetScrolling( bool bScroll, float Percent = 0); + bool IsScrolling() { return m_bScrolling; } + float ScrollingPercent() { return m_fPercentScrolling; } protected: bool m_bScrolling; diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp index 8cd13f14a4..a0c790bf7c 100644 --- a/stepmania/src/FadingBanner.cpp +++ b/stepmania/src/FadingBanner.cpp @@ -44,14 +44,13 @@ void FadingBanner::BeforeChange() if( m_Banner[0].GetTexturePath() != "" ) { m_Banner[1].Load( m_Banner[0].GetTexturePath() ); - m_Banner[1].SetScrolling( m_Banner[0].IsScrolling() ); + m_Banner[1].SetScrolling( m_Banner[0].IsScrolling(), m_Banner[0].ScrollingPercent() ); } m_Banner[1].SetDiffuse( RageColor(1,1,1,1) ); m_Banner[1].StopTweening(); m_Banner[1].BeginTweening( 0.25f ); // fade out m_Banner[1].SetTweenDiffuse( RageColor(1,1,1,0) ); - } void FadingBanner::SetFromSong( Song* pSong )