From 89bcacf2981848c2642007d4e8ecebc5b3dd39cc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 26 Aug 2005 19:55:01 +0000 Subject: [PATCH] removing GetMetricC --- stepmania/src/ScreenCredits.cpp | 18 ++++++++++++------ stepmania/src/ScreenCredits.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index d442cecd36..ce5dbfeb70 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -18,9 +18,9 @@ #define BACKGROUNDS_SCROLL_SECONDS_PER_ITEM THEME->GetMetricF("ScreenCredits","BackgroundsScrollSecondsPerItem") #define BACKGROUNDS_WIDTH THEME->GetMetricF("ScreenCredits","BackgroundsWidth") #define BACKGROUNDS_HEIGHT THEME->GetMetricF("ScreenCredits","BackgroundsHeight") -#define TEXTS_COLOR_INTRO THEME->GetMetricC("ScreenCredits","TextsColorIntro") -#define TEXTS_COLOR_HEADER THEME->GetMetricC("ScreenCredits","TextsColorHeader") -#define TEXTS_COLOR_NORMAL THEME->GetMetricC("ScreenCredits","TextsColorNormal") +#define TEXTS_INTRO_COMMAND THEME->GetMetricA("ScreenCredits","TextsIntroCommand") +#define TEXTS_HEADER_COMMAND THEME->GetMetricA("ScreenCredits","TextsHeaderCommand") +#define TEXTS_NORMAL_COMMAND THEME->GetMetricA("ScreenCredits","TextsNormalCommand") #define TEXTS_ZOOM THEME->GetMetricF("ScreenCredits","TextsZoom") #define TEXTS_SPACING_X THEME->GetMetricF("ScreenCredits","TextsSpacingX") #define TEXTS_SPACING_Y THEME->GetMetricF("ScreenCredits","TextsSpacingY") @@ -160,6 +160,12 @@ static const CreditLine CREDIT_LINES[] = REGISTER_SCREEN_CLASS( ScreenCredits ); ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName ) { +} + +void ScreenCredits::Init() +{ + ScreenAttract::Init(); + vector arraySongs; SONGMAN->GetSongs( arraySongs ); SongUtil::SortSongPointerArrayByTitle( arraySongs ); @@ -254,9 +260,9 @@ ScreenCredits::ScreenCredits( CString sName ) : ScreenAttract( sName ) pText->SetText( CREDIT_LINES[i].text ); switch( CREDIT_LINES[i].colorIndex ) { - case 1: pText->SetDiffuse( TEXTS_COLOR_INTRO ); break; - case 2: pText->SetDiffuse( TEXTS_COLOR_HEADER ); break; - case 0: pText->SetDiffuse( TEXTS_COLOR_NORMAL ); break; + case 1: pText->RunCommands( TEXTS_INTRO_COMMAND ); break; + case 2: pText->RunCommands( TEXTS_HEADER_COMMAND ); break; + case 0: pText->RunCommands( TEXTS_NORMAL_COMMAND ); break; default: ASSERT(0); } pText->SetZoom( TEXTS_ZOOM ); diff --git a/stepmania/src/ScreenCredits.h b/stepmania/src/ScreenCredits.h index 627eaf58ea..a0ccc7d42c 100644 --- a/stepmania/src/ScreenCredits.h +++ b/stepmania/src/ScreenCredits.h @@ -11,6 +11,7 @@ class ScreenCredits : public ScreenAttract { public: ScreenCredits( CString sName ); + virtual void Init(); virtual ~ScreenCredits(); virtual void HandleScreenMessage( const ScreenMessage SM );