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

explicitly Load TextBanner to read metrics - don't automatically init on first use

Browse Source
This commit is contained in:
Chris Danford
2005-03-18 01:55:33 +00:00
parent 778ac6a63d
commit 9b1fb67f6a
4 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CourseEntryDisplay.cpp
+3 -2
View File
@@ -14,7 +14,7 @@
#include "ActorUtil.h" #include "ActorUtil.h"
#define SEPARATE_COURSE_METERS THEME->GetMetricB(m_sName,"SeparateCourseMeters") #define SEPARATE_COURSE_METERS THEME->GetMetricB(m_sName,"SeparateCourseMeters")
#define TEXT_BANNER_NAME THEME->GetMetric (m_sName,"TextBannerName") #define TEXT_BANNER_TYPE THEME->GetMetric (m_sName,"TextBannerType")
void CourseEntryDisplay::Load() void CourseEntryDisplay::Load()
{ {
@@ -31,7 +31,8 @@ void CourseEntryDisplay::Load()
SET_XY_AND_ON_COMMAND( &m_textNumber ); SET_XY_AND_ON_COMMAND( &m_textNumber );
this->AddChild( &m_textNumber ); this->AddChild( &m_textNumber );
m_TextBanner.SetName( TEXT_BANNER_NAME, "TextBanner" ); m_TextBanner.SetName( "TextBanner" );
m_TextBanner.Load( TEXT_BANNER_TYPE );
SET_XY_AND_ON_COMMAND( &m_TextBanner ); SET_XY_AND_ON_COMMAND( &m_TextBanner );
/* Load the m_TextBanner now, so any actor commands sent to us will propagate correctly. */ /* Load the m_TextBanner now, so any actor commands sent to us will propagate correctly. */
m_TextBanner.LoadFromString( "", "", "", "", "", "" ); m_TextBanner.LoadFromString( "", "", "", "", "", "" );
stepmania/src/MusicWheelItem.cpp
+1 -2
View File
@@ -48,8 +48,7 @@ MusicWheelItem::MusicWheelItem()
m_fPercentGray = 0; m_fPercentGray = 0;
m_WheelNotifyIcon.SetXY( ICON_X, 0 ); m_WheelNotifyIcon.SetXY( ICON_X, 0 );
m_TextBanner.SetName( "TextBanner" ); m_TextBanner.Load( "TextBanner" );
m_TextBanner.Init();
m_TextBanner.SetHorizAlign( align_left ); m_TextBanner.SetHorizAlign( align_left );
m_TextBanner.SetXY( SONG_NAME_X, 0 ); m_TextBanner.SetXY( SONG_NAME_X, 0 );
m_All.AddChild( &m_TextBanner ); m_All.AddChild( &m_TextBanner );
stepmania/src/TextBanner.cpp
+16 -20
View File
@@ -11,37 +11,33 @@
#include "Command.h" #include "Command.h"
void TextBanner::Init() void TextBanner::Load( CString sType )
{ {
if( m_bInitted )
return;
m_bInitted = true; m_bInitted = true;
m_textTitle.SetName( "Title" ); m_textTitle.SetName( "Title" );
m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") ); m_textTitle.LoadFromFont( THEME->GetPathF(sType,"text") );
this->AddChild( &m_textTitle ); this->AddChild( &m_textTitle );
m_textSubTitle.SetName( "Subtitle" ); m_textSubTitle.SetName( "Subtitle" );
m_textSubTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") ); m_textSubTitle.LoadFromFont( THEME->GetPathF(sType,"text") );
this->AddChild( &m_textSubTitle ); this->AddChild( &m_textSubTitle );
m_textArtist.SetName( "Artist" ); m_textArtist.SetName( "Artist" );
m_textArtist.LoadFromFont( THEME->GetPathF(m_sName,"text") ); m_textArtist.LoadFromFont( THEME->GetPathF(sType,"text") );
this->AddChild( &m_textArtist ); this->AddChild( &m_textArtist );
ARTIST_PREPEND_STRING .Load(m_sName,"ArtistPrependString"); ARTIST_PREPEND_STRING .Load(sType,"ArtistPrependString");
TWO_LINES_TITLE_COMMAND .Load(m_sName,"TwoLinesTitleCommand"); TWO_LINES_TITLE_COMMAND .Load(sType,"TwoLinesTitleCommand");
TWO_LINES_SUBTITLE_COMMAND .Load(m_sName,"TwoLinesSubtitleCommand"); TWO_LINES_SUBTITLE_COMMAND .Load(sType,"TwoLinesSubtitleCommand");
TWO_LINES_ARTIST_COMMAND .Load(m_sName,"TwoLinesArtistCommand"); TWO_LINES_ARTIST_COMMAND .Load(sType,"TwoLinesArtistCommand");
THREE_LINES_TITLE_COMMAND .Load(m_sName,"ThreeLinesTitleCommand"); THREE_LINES_TITLE_COMMAND .Load(sType,"ThreeLinesTitleCommand");
THREE_LINES_SUBTITLE_COMMAND .Load(m_sName,"ThreeLinesSubtitleCommand"); THREE_LINES_SUBTITLE_COMMAND .Load(sType,"ThreeLinesSubtitleCommand");
THREE_LINES_ARTIST_COMMAND .Load(m_sName,"ThreeLinesArtistCommand"); THREE_LINES_ARTIST_COMMAND .Load(sType,"ThreeLinesArtistCommand");
ASSERT( m_sName != "" ); ActorUtil::SetXYAndOnCommand( m_textTitle, sType );
ActorUtil::SetXYAndOnCommand( m_textSubTitle, sType );
SET_XY_AND_ON_COMMAND( m_textTitle ); ActorUtil::SetXYAndOnCommand( m_textArtist, sType );
SET_XY_AND_ON_COMMAND( m_textSubTitle );
SET_XY_AND_ON_COMMAND( m_textArtist );
} }
TextBanner::TextBanner() TextBanner::TextBanner()
@@ -55,7 +51,7 @@ void TextBanner::LoadFromString(
CString sDisplaySubTitle, CString sTranslitSubTitle, CString sDisplaySubTitle, CString sTranslitSubTitle,
CString sDisplayArtist, CString sTranslitArtist ) CString sDisplayArtist, CString sTranslitArtist )
{ {
Init(); ASSERT( m_bInitted );
m_textTitle.SetText( sDisplayTitle, sTranslitTitle ); m_textTitle.SetText( sDisplayTitle, sTranslitTitle );
m_textSubTitle.SetText( sDisplaySubTitle, sTranslitSubTitle ); m_textSubTitle.SetText( sDisplaySubTitle, sTranslitSubTitle );
@@ -79,7 +75,7 @@ void TextBanner::LoadFromString(
void TextBanner::LoadFromSong( const Song* pSong ) void TextBanner::LoadFromSong( const Song* pSong )
{ {
Init(); ASSERT( m_bInitted );
CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : CString(""); CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : CString("");
CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : CString(""); CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : CString("");
stepmania/src/TextBanner.h
+1 -1
View File
@@ -12,7 +12,7 @@ class TextBanner : public ActorFrame
{ {
public: public:
TextBanner(); TextBanner();
void Init(); // load metrics void Load( CString sType ); // load metrics
void LoadFromSong( const Song* pSong ); void LoadFromSong( const Song* pSong );
void LoadFromString( void LoadFromString(
CString sDisplayTitle, CString sTranslitTitle, CString sDisplayTitle, CString sTranslitTitle,