actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix scrolling when fading out of roulette

Browse Source
This commit is contained in:
Glenn Maynard
2003-02-12 22:54:22 +00:00
parent b129bd7601
commit a3edbe2e65
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Banner.cpp
+6 -6
View File
@@ -66,20 +66,18 @@ void Banner::SetScrolling( bool bScroll, float Percent)
void Banner::LoadFromSong( Song* pSong ) // NULL means no song void Banner::LoadFromSong( Song* pSong ) // NULL means no song
{ {
m_bScrolling = false;
Sprite::TurnShadowOff(); Sprite::TurnShadowOff();
if( pSong == NULL ) LoadFallback(); if( pSong == NULL ) LoadFallback();
else if( pSong->HasBanner() ) Load( pSong->GetBannerPath() ); else if( pSong->HasBanner() ) Load( pSong->GetBannerPath() );
else if( PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) Load( pSong->GetBackgroundPath() ); else if( PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) Load( pSong->GetBackgroundPath() );
else LoadFallback(); else LoadFallback();
m_bScrolling = false;
} }
void Banner::LoadFromGroup( CString sGroupName ) void Banner::LoadFromGroup( CString sGroupName )
{ {
m_bScrolling = false;
CString sGroupBannerPath = SONGMAN->GetGroupBannerPath( sGroupName ); CString sGroupBannerPath = SONGMAN->GetGroupBannerPath( sGroupName );
if( sGroupName == "ALL MUSIC" ) if( sGroupName == "ALL MUSIC" )
@@ -88,17 +86,19 @@ void Banner::LoadFromGroup( CString sGroupName )
Load( sGroupBannerPath ); Load( sGroupBannerPath );
else else
LoadFallback(); LoadFallback();
m_bScrolling = false;
} }
void Banner::LoadFromCourse( Course* pCourse ) // NULL means no course void Banner::LoadFromCourse( Course* pCourse ) // NULL means no course
{ {
m_bScrolling = false;
Sprite::TurnShadowOff(); Sprite::TurnShadowOff();
if( pCourse == NULL ) LoadFallback(); if( pCourse == NULL ) LoadFallback();
else if( pCourse->m_sBannerPath != "" ) Load( pCourse->m_sBannerPath ); else if( pCourse->m_sBannerPath != "" ) Load( pCourse->m_sBannerPath );
else LoadFallback(); else LoadFallback();
m_bScrolling = false;
} }
void Banner::LoadFallback() void Banner::LoadFallback()