diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index baec6f553c..98d4342684 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -578,10 +578,6 @@ MusicWheelX=SCREEN_CENTER_X+160 MusicWheelY=SCREEN_CENTER_Y+4 MusicWheelOnCommand= MusicWheelOffCommand= -WheelUnderX= -WheelUnderY= -WheelUnderOnCommand=hidden,1 -WheelUnderOffCommand= BalloonX=SCREEN_CENTER_X+58 BalloonY=SCREEN_CENTER_Y-33 BalloonOnCommand=diffusealpha,0;linear,0.2;diffusealpha,1;rotationz,0; diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index d9dd6e10d0..2f43a3d2cc 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -116,11 +116,6 @@ void ScreenSelectMusic::Init() /* Load low-res banners, if needed. */ BANNERCACHE->Demand(); - m_MusicWheelUnder.Load( THEME->GetPathG(m_sName,"wheel under") ); - m_MusicWheelUnder->SetName( "WheelUnder" ); - SET_XY( m_MusicWheelUnder ); - this->AddChild( m_MusicWheelUnder ); - m_MusicWheel.SetName( "MusicWheel" ); m_MusicWheel.Load( MUSIC_WHEEL_TYPE ); SET_XY( m_MusicWheel ); @@ -324,7 +319,6 @@ void ScreenSelectMusic::BeginScreen() ON_COMMAND( m_GrooveRadar ); ON_COMMAND( m_textNumSongs ); ON_COMMAND( m_textTotalTime ); - ON_COMMAND( m_MusicWheelUnder ); ON_COMMAND( m_MusicWheel ); ON_COMMAND( m_sprLongBalloon ); ON_COMMAND( m_sprMarathonBalloon ); @@ -453,7 +447,6 @@ void ScreenSelectMusic::TweenOffScreen() OFF_COMMAND( m_textNumSongs ); OFF_COMMAND( m_textTotalTime ); OFF_COMMAND( m_MusicWheel ); - OFF_COMMAND( m_MusicWheelUnder ); OFF_COMMAND( m_MusicWheel ); OFF_COMMAND( m_sprLongBalloon ); OFF_COMMAND( m_sprMarathonBalloon ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 37f905ef11..1471243baf 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -106,7 +106,6 @@ protected: Sprite m_sprHighScoreFrame[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS]; MusicWheel m_MusicWheel; - AutoActor m_MusicWheelUnder; AutoActor m_sprLongBalloon; AutoActor m_sprMarathonBalloon; AutoActor m_sprCourseHasMods;