From 2df07eff4c5653666bfcef55be0499ce417b4e08 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 23 Mar 2004 21:59:33 +0000 Subject: [PATCH] add MaxStages text to ScreenTitleMenu --- stepmania/Themes/default/metrics.ini | 4 +++- stepmania/src/ScreenTitleMenu.cpp | 6 ++++++ stepmania/src/ScreenTitleMenu.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index a3e85d145d..12d14c5038 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -17,7 +17,7 @@ ColorP2=1.0,0.5,0.2,1 // orange InitialScreen=ScreenCompany WindowTitle=StepMania DefaultModifiers= -JoinDelaySeconds=0.8 +JoinPauseSeconds=0.8 [ModeSwitcher] PrevModeX=-200 @@ -64,6 +64,8 @@ LogoHomeOnCommand=x,320;y,240;zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift; LogoOnCommand=x,320;y,240;zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3 VersionOnCommand=horizalign,right;x,620;y,20;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2 SongsOnCommand=horizalign,left;x,20;y,20;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2 +MaxStagesOnCommand=hidden,1 +MaxStagesText= ChoicesX=320 ChoicesStartY=86 ChoicesSpacingY=48 diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index c11cab44ce..672d529d51 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -36,6 +36,8 @@ #define LOGO_HOME_ON_COMMAND THEME->GetMetric("ScreenTitleMenu","LogoHomeOnCommand") #define VERSION_ON_COMMAND THEME->GetMetric("ScreenTitleMenu","VersionOnCommand") #define SONGS_ON_COMMAND THEME->GetMetric("ScreenTitleMenu","SongsOnCommand") +#define MAX_STAGES_ON_COMMAND THEME->GetMetric("ScreenTitleMenu","MaxStagesOnCommand") +#define MAX_STAGES_TEXT THEME->GetMetric("ScreenTitleMenu","MaxStagesText") #define HELP_X THEME->GetMetricF("ScreenTitleMenu","HelpX") #define HELP_Y THEME->GetMetricF("ScreenTitleMenu","HelpY") #define CHOICES_X THEME->GetMetricF("ScreenTitleMenu","ChoicesX") @@ -113,6 +115,10 @@ ScreenTitleMenu::ScreenTitleMenu( CString sClassName ) : ScreenSelect( sClassNam m_textSongs.SetText( text ); this->AddChild( &m_textSongs ); + m_textMaxStages.LoadFromFont( THEME->GetPathF(m_sName,"MaxStages") ); + m_textMaxStages.Command( MAX_STAGES_ON_COMMAND ); + m_textMaxStages.SetText( ssprintf("%d "+MAX_STAGES_TEXT, PREFSMAN->m_iNumArcadeStages ) ); + this->AddChild( &m_textMaxStages ); CString sCoinMode = CoinModeToString((CoinMode)PREFSMAN->m_iCoinMode); m_CoinMode.LoadFromAniDir( THEME->GetPathToB("ScreenTitleMenu "+sCoinMode) ); diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h index 2f8a017b85..cd770b09b8 100644 --- a/stepmania/src/ScreenTitleMenu.h +++ b/stepmania/src/ScreenTitleMenu.h @@ -42,6 +42,7 @@ private: Sprite m_sprLogo; BitmapText m_textVersion; BitmapText m_textSongs; + BitmapText m_textMaxStages; BitmapText m_textHelp; BitmapText m_textChoice[MAX_MODE_CHOICES];