diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 201ac13773..e98e0b4e64 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -462,10 +462,6 @@ BannerOnCommand=scaletoclipped,256,80;hidden,1 BannerOffCommand= BannerWidth=256 BannerHeight=80 -BPMDisplayX=SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6 -BPMDisplayY=SCREEN_CENTER_Y-133 -BPMDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 -BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 ShowStage=1 StageX=SCREEN_CENTER_X-272-SCREEN_WIDTH*0.6 StageY=SCREEN_CENTER_Y-134 diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 3af8709229..aac45f9446 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -127,11 +127,6 @@ void ScreenSelectMusic::Init() SET_XY( m_Banner ); this->AddChild( &m_Banner ); - m_BPMDisplay.SetName( "BPMDisplay" ); - m_BPMDisplay.Load(); - SET_XY( m_BPMDisplay ); - this->AddChild( &m_BPMDisplay ); - m_DifficultyDisplay.SetName( "DifficultyDisplay" ); m_DifficultyDisplay.SetShadowLength( 0 ); SET_XY( m_DifficultyDisplay ); @@ -303,7 +298,6 @@ void ScreenSelectMusic::BeginScreen() } ON_COMMAND( m_Banner ); - ON_COMMAND( m_BPMDisplay ); ON_COMMAND( m_DifficultyDisplay ); ON_COMMAND( m_sprCDTitleFront ); ON_COMMAND( m_sprCDTitleBack ); @@ -428,7 +422,6 @@ void ScreenSelectMusic::TweenOffScreen() } OFF_COMMAND( m_Banner ); - OFF_COMMAND( m_BPMDisplay ); OFF_COMMAND( m_DifficultyDisplay ); OFF_COMMAND( m_sprCDTitleFront ); OFF_COMMAND( m_sprCDTitleBack ); @@ -1398,7 +1391,6 @@ void ScreenSelectMusic::AfterMusicChange() FOREACH_PlayerNumber( p ) m_iSelection[p] = -1; - m_BPMDisplay.NoBPM(); g_sCDTitlePath = ""; // none m_DifficultyDisplay.UnsetDifficulties(); @@ -1450,15 +1442,6 @@ void ScreenSelectMusic::AfterMusicChange() if ( PREFSMAN->m_bShowBanners ) g_sBannerPath = pSong->GetBannerPath(); - if( GAMESTATE->IsAnExtraStage() ) - { - m_BPMDisplay.CycleRandomly(); - } - else - { - m_BPMDisplay.SetBpmFromSong( pSong ); - } - g_sCDTitlePath = pSong->GetCDTitlePath(); g_bWantFallbackCdTitle = true; @@ -1503,7 +1486,6 @@ void ScreenSelectMusic::AfterMusicChange() case TYPE_RANDOM: m_Banner.LoadRandom(); break; default: ASSERT(0); } - m_BPMDisplay.NoBPM(); g_sCDTitlePath = ""; // none m_DifficultyDisplay.UnsetDifficulties(); @@ -1553,11 +1535,6 @@ void ScreenSelectMusic::AfterMusicChange() if( g_sBannerPath.empty() ) m_Banner.LoadFallback(); - if( (int)pTrail->m_vEntries.size() > CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS ) - m_BPMDisplay.SetVarious(); - else - m_BPMDisplay.SetBpmFromCourse( pCourse ); - m_DifficultyDisplay.UnsetDifficulties(); SwitchToPreferredDifficulty(); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index e0537f2242..4428036596 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -10,7 +10,6 @@ #include "MusicWheel.h" #include "Banner.h" #include "FadingBanner.h" -#include "BPMDisplay.h" #include "GrooveRadar.h" #include "DifficultyIcon.h" #include "DifficultyMeter.h" @@ -92,7 +91,6 @@ protected: RString m_sFallbackCDTitlePath; FadingBanner m_Banner; - BPMDisplay m_BPMDisplay; Sprite m_sprCDTitleFront, m_sprCDTitleBack; Sprite m_sprDifficultyFrame[NUM_PLAYERS]; DifficultyIcon m_DifficultyIcon[NUM_PLAYERS];