From 7f7d798cc098ce1ed870433e2c01a040a1592c4c Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sat, 21 Apr 2007 22:08:15 +0000 Subject: [PATCH] Simplify. --- stepmania/src/TextBanner.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp index fb06d7ffa6..749cfa3eac 100644 --- a/stepmania/src/TextBanner.cpp +++ b/stepmania/src/TextBanner.cpp @@ -98,19 +98,14 @@ void TextBanner::LoadFromString( void TextBanner::LoadFromSong( const Song *pSong ) { - ASSERT( m_bInitted ); - - RString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : RString(""); - RString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : RString(""); - RString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : RString(""); - RString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : RString(""); - RString sDisplayArtist = pSong ? m_sArtistPrependString + pSong->GetDisplayArtist() : RString(""); - RString sTranslitArtist = pSong ? m_sArtistPrependString + pSong->GetTranslitArtist() : RString(""); - - LoadFromString( - sDisplayTitle, sTranslitTitle, - sDisplaySubTitle, sTranslitSubTitle, - sDisplayArtist, sTranslitArtist ); + if( pSong == NULL ) + { + LoadFromString( "", "", "", "", "", "" ); + return; + } + LoadFromString( pSong->GetDisplayMainTitle(), pSong->GetTranslitMainTitle(), + pSong->GetDisplaySubTitle(), pSong->GetTranslitSubTitle(), + m_sArtistPrependString + pSong->GetDisplayArtist(), m_sArtistPrependString + pSong->GetTranslitArtist() ); } // lua start