Simplify.

This commit is contained in:
Steve Checkoway
2007-04-21 22:08:15 +00:00
parent 15b259f4f5
commit 7f7d798cc0
+8 -13
View File
@@ -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