cleanup
This commit is contained in:
@@ -98,34 +98,34 @@ void Banner::LoadMode()
|
|||||||
void Banner::LoadFromSongGroup( RString sSongGroup )
|
void Banner::LoadFromSongGroup( RString sSongGroup )
|
||||||
{
|
{
|
||||||
RString sGroupBannerPath = SONGMAN->GetSongGroupBannerPath( sSongGroup );
|
RString sGroupBannerPath = SONGMAN->GetSongGroupBannerPath( sSongGroup );
|
||||||
if( sGroupBannerPath != "" ) Load( sGroupBannerPath );
|
if( sGroupBannerPath != "" ) Load( sGroupBannerPath );
|
||||||
else LoadFallback();
|
else LoadFallback();
|
||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Banner::LoadFromCourse( Course* pCourse ) // NULL means no course
|
void Banner::LoadFromCourse( Course* pCourse ) // NULL means no course
|
||||||
{
|
{
|
||||||
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 LoadCourseFallback();
|
else LoadCourseFallback();
|
||||||
|
|
||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Banner::LoadCardFromCharacter( Character* pCharacter )
|
void Banner::LoadCardFromCharacter( Character* pCharacter )
|
||||||
{
|
{
|
||||||
if( pCharacter == NULL ) LoadFallback();
|
if( pCharacter == NULL ) LoadFallback();
|
||||||
else if( pCharacter->GetCardPath() != "" ) Load( pCharacter->GetCardPath() );
|
else if( pCharacter->GetCardPath() != "" ) Load( pCharacter->GetCardPath() );
|
||||||
else LoadFallback();
|
else LoadFallback();
|
||||||
|
|
||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Banner::LoadIconFromCharacter( Character* pCharacter )
|
void Banner::LoadIconFromCharacter( Character* pCharacter )
|
||||||
{
|
{
|
||||||
if( pCharacter == NULL ) LoadFallbackCharacterIcon();
|
if( pCharacter == NULL ) LoadFallbackCharacterIcon();
|
||||||
else if( pCharacter->GetIconPath() != "" ) Load( pCharacter->GetIconPath(), false );
|
else if( pCharacter->GetIconPath() != "" ) Load( pCharacter->GetIconPath(), false );
|
||||||
else LoadFallbackCharacterIcon();
|
else LoadFallbackCharacterIcon();
|
||||||
|
|
||||||
m_bScrolling = false;
|
m_bScrolling = false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user