From ee10a98b35276356c1e87bda639931feebeedbcb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 16 Mar 2003 02:59:34 +0000 Subject: [PATCH] fix unscrolled banner being displayed for one frame make sure we include hints when reloading the texture when fading, or hints may not match and it'll get reloaded --- stepmania/src/FadingBanner.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp index bee9ba7c87..c0ec3608a8 100644 --- a/stepmania/src/FadingBanner.cpp +++ b/stepmania/src/FadingBanner.cpp @@ -34,15 +34,20 @@ void FadingBanner::DrawPrimitives() bool FadingBanner::Load( RageTextureID ID ) { BeforeChange(); - return Banner::Load(ID); + + if(!Banner::Load(ID)) + return false; + + Update(0); + return true; } void FadingBanner::BeforeChange() { // move the back banner to the front in preparation for a cross fade - if( this->GetTexturePath() != "" ) + if( this->GetTexture() ) { - m_FrontBanner.Load( this->GetTexturePath() ); + m_FrontBanner.Load( this->GetTexture()->GetID() ); m_FrontBanner.SetScrolling( this->IsScrolling(), this->ScrollingPercent() ); }