Simplify.
This commit is contained in:
@@ -98,19 +98,14 @@ void TextBanner::LoadFromString(
|
|||||||
|
|
||||||
void TextBanner::LoadFromSong( const Song *pSong )
|
void TextBanner::LoadFromSong( const Song *pSong )
|
||||||
{
|
{
|
||||||
ASSERT( m_bInitted );
|
if( pSong == NULL )
|
||||||
|
{
|
||||||
RString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : RString("");
|
LoadFromString( "", "", "", "", "", "" );
|
||||||
RString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : RString("");
|
return;
|
||||||
RString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : RString("");
|
}
|
||||||
RString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : RString("");
|
LoadFromString( pSong->GetDisplayMainTitle(), pSong->GetTranslitMainTitle(),
|
||||||
RString sDisplayArtist = pSong ? m_sArtistPrependString + pSong->GetDisplayArtist() : RString("");
|
pSong->GetDisplaySubTitle(), pSong->GetTranslitSubTitle(),
|
||||||
RString sTranslitArtist = pSong ? m_sArtistPrependString + pSong->GetTranslitArtist() : RString("");
|
m_sArtistPrependString + pSong->GetDisplayArtist(), m_sArtistPrependString + pSong->GetTranslitArtist() );
|
||||||
|
|
||||||
LoadFromString(
|
|
||||||
sDisplayTitle, sTranslitTitle,
|
|
||||||
sDisplaySubTitle, sTranslitSubTitle,
|
|
||||||
sDisplayArtist, sTranslitArtist );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// lua start
|
// lua start
|
||||||
|
|||||||
Reference in New Issue
Block a user