actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
Chris Danford
2005-03-02 03:41:04 +00:00
parent 78d7035b02
commit b0b83591c2
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/TextBanner.cpp
+12 -12
View File
@@ -17,6 +17,18 @@ void TextBanner::Init()
return; return;
m_bInitted = true; 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"); ARTIST_PREPEND_STRING .Load(m_sName,"ArtistPrependString");
TWO_LINES_TITLE_COMMAND .Load(m_sName,"TwoLinesTitleCommand"); TWO_LINES_TITLE_COMMAND .Load(m_sName,"TwoLinesTitleCommand");
TWO_LINES_SUBTITLE_COMMAND .Load(m_sName,"TwoLinesSubtitleCommand"); TWO_LINES_SUBTITLE_COMMAND .Load(m_sName,"TwoLinesSubtitleCommand");
@@ -34,18 +46,6 @@ void TextBanner::Init()
TextBanner::TextBanner() 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; m_bInitted = false;
} }