From b0b83591c253aa30fe349afd3eeac5d4d3d1f6a6 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 2 Mar 2005 03:41:04 +0000 Subject: [PATCH] fix bad merge --- stepmania/src/TextBanner.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp index 04b7b3e759..e2c1f96738 100644 --- a/stepmania/src/TextBanner.cpp +++ b/stepmania/src/TextBanner.cpp @@ -17,6 +17,18 @@ void TextBanner::Init() return; m_bInitted = true; + m_textTitle.SetName( "Title" ); + m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") ); + this->AddChild( &m_textTitle ); + + m_textSubTitle.SetName( "Subtitle" ); + m_textSubTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") ); + this->AddChild( &m_textSubTitle ); + + m_textArtist.SetName( "Artist" ); + m_textArtist.LoadFromFont( THEME->GetPathF(m_sName,"text") ); + this->AddChild( &m_textArtist ); + ARTIST_PREPEND_STRING .Load(m_sName,"ArtistPrependString"); TWO_LINES_TITLE_COMMAND .Load(m_sName,"TwoLinesTitleCommand"); TWO_LINES_SUBTITLE_COMMAND .Load(m_sName,"TwoLinesSubtitleCommand"); @@ -34,18 +46,6 @@ void TextBanner::Init() TextBanner::TextBanner() { - m_textTitle.SetName( "Title" ); - m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") ); - this->AddChild( &m_textTitle ); - - m_textSubTitle.SetName( "Subtitle" ); - m_textSubTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") ); - this->AddChild( &m_textSubTitle ); - - m_textArtist.SetName( "Artist" ); - m_textArtist.LoadFromFont( THEME->GetPathF(m_sName,"text") ); - this->AddChild( &m_textArtist ); - m_bInitted = false; }