diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 4a007d00e3..281b1f3e66 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -286,6 +286,9 @@ StageType=0 // 0 for MAX, 1 for Pump, 2 for EZ2 BPMX=999 // don't show by default BPMY=999 BPMZoom=0.0 +StagenameX=999 +StagenameY=999 +StagenameZoom=0.0 LifeFrameX=320 LifeFrameY=36 LifeFrameExtraY=442 diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp index ca55d8d312..4906428799 100644 --- a/stepmania/src/BPMDisplay.cpp +++ b/stepmania/src/BPMDisplay.cpp @@ -48,7 +48,7 @@ BPMDisplay::BPMDisplay() m_textLabel.TurnShadowOff(); m_textLabel.SetXY( 34, 2 ); m_textLabel.SetText( "BPM" ); -// if(GAMESTATE-> + m_textLabel.SetZoom( 0.7f ); m_textLabel.SetZoomX( 0.5f ); m_textLabel.SetDiffuseTopEdge( NORMAL_COLOR_TOP ); // yellow diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 3b4ed5c416..d423ded70e 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -35,6 +35,9 @@ #define BPM_X THEME->GetMetricF("ScreenGameplay","BPMX") #define BPM_Y THEME->GetMetricF("ScreenGameplay","BPMY") #define BPM_ZOOM THEME->GetMetricF("ScreenGameplay","BPMZoom") +#define STAGENAME_X THEME->GetMetricF("ScreenGameplay","StagenameX") +#define STAGENAME_Y THEME->GetMetricF("ScreenGameplay","StagenameY") +#define STAGENAME_ZOOM THEME->GetMetricF("ScreenGameplay","StagenameZoom") #define LIFE_FRAME_X THEME->GetMetricF("ScreenGameplay","LifeFrameX") #define LIFE_FRAME_Y( e ) THEME->GetMetricF("ScreenGameplay",ssprintf("LifeFrame%sY",e?"Extra":"")) #define SCORE_FRAME_X THEME->GetMetricF("ScreenGameplay","ScoreFrameX") @@ -272,6 +275,13 @@ ScreenGameplay::ScreenGameplay() m_sprScoreFrame.SetXY( SCORE_FRAME_X, SCORE_FRAME_Y(bExtra) ); this->AddChild( &m_sprScoreFrame ); + m_StageName.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") ); + m_StageName.TurnShadowOff(); + m_StageName.SetXY( STAGENAME_X, STAGENAME_Y ); + m_StageName.SetZoom( STAGENAME_ZOOM ); + m_StageName.SetText( GAMESTATE->m_pCurSong->m_sMainTitle ); + this->AddChild( &m_StageName ); + for( p=0; pIsPlayerEnabled(PlayerNumber(p)) ) @@ -385,7 +395,6 @@ ScreenGameplay::ScreenGameplay() m_Fade.SetOpened(); this->AddChild( &m_Fade ); - m_textSurviveTime.LoadFromFont( THEME->GetPathTo("Fonts","survive time") ); m_textSurviveTime.TurnShadowOff(); m_textSurviveTime.SetXY( SURVIVE_TIME_X, SURVIVE_TIME_Y ); diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 29b822d0d8..0563d17484 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -111,7 +111,7 @@ private: MotionBlurSprite m_sprTryExtraStage; BitmapText m_textSurviveTime; // only shown in extra stage - + BitmapText m_StageName; Player m_Player[NUM_PLAYERS];