diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e4a4b81feb..3642afaf28 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -473,22 +473,6 @@ CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,back; CDTitleBackCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,front;diffuse,#606060; CDTitleOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 CDTitleOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -CharacterIconP1Y=-1000 -CharacterIconP1X=-1000 -CharacterIconP2Y=-1000 -CharacterIconP2X=-1000 -CharacterIconP1OnCommand=hidden,1 -CharacterIconP2OnCommand=hidden,1 -CharacterIconP1OffCommand= -CharacterIconP2OffCommand= -DifficultyFrameP1X=SCREEN_CENTER_X-275 -DifficultyFrameP1Y=SCREEN_CENTER_Y-15 -DifficultyFrameP1OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1 -DifficultyFrameP1OffCommand=linear,0.5;diffusealpha,0 -DifficultyFrameP2X=SCREEN_CENTER_X-82 -DifficultyFrameP2Y=SCREEN_CENTER_Y-15 -DifficultyFrameP2OnCommand=diffusealpha,0;linear,0.5;diffusealpha,1 -DifficultyFrameP2OffCommand=linear,0.5;diffusealpha,0 DifficultyIconP1X=SCREEN_CENTER_X-290 DifficultyIconP1Y=SCREEN_CENTER_Y-15 DifficultyIconP1OnCommand=zoomy,0;linear,0.5;zoomy,1 @@ -532,14 +516,6 @@ MachineRankX= MachineRankY= MachineRankOnCommand=hidden,1 MachineRankOffCommand= -MeterFrameP1X=SCREEN_CENTER_X-238 -MeterFrameP1Y=SCREEN_CENTER_Y+192 -MeterFrameP1OnCommand=hidden,1; -MeterFrameP1OffCommand= -MeterFrameP2X=SCREEN_CENTER_X-82 -MeterFrameP2Y=SCREEN_CENTER_Y+192 -MeterFrameP2OnCommand=hidden,1; -MeterFrameP2OffCommand= MeterType=DifficultyMeter MeterP1X=SCREEN_CENTER_X-254 MeterP1Y=SCREEN_CENTER_Y-20 diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 44f141b796..a096917a3b 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -170,11 +170,6 @@ void ScreenSelectMusic::Init() SET_XY( m_DifficultyIcon[p] ); this->AddChild( &m_DifficultyIcon[p] ); - m_sprMeterFrame[p].SetName( ssprintf("MeterFrameP%d",p+1) ); - m_sprMeterFrame[p].Load( THEME->GetPathG(m_sName,ssprintf("meter frame p%d",p+1)) ); - SET_XY( m_sprMeterFrame[p] ); - this->AddChild( &m_sprMeterFrame[p] ); - m_DifficultyMeter[p].SetName( ssprintf("MeterP%d",p+1) ); m_DifficultyMeter[p].Load( METER_TYPE ); SET_XY( m_DifficultyMeter[p] ); @@ -273,7 +268,6 @@ void ScreenSelectMusic::TweenSongPartsOnScreen() { FOREACH_HumanPlayer( p ) { - ON_COMMAND( m_sprMeterFrame[p] ); ON_COMMAND( m_DifficultyIcon[p] ); } } @@ -286,7 +280,6 @@ void ScreenSelectMusic::TweenSongPartsOffScreen() { FOREACH_HumanPlayer( p ) { - OFF_COMMAND( m_sprMeterFrame[p] ); OFF_COMMAND( m_DifficultyIcon[p] ); } } @@ -298,7 +291,6 @@ void ScreenSelectMusic::SkipSongPartTweens() FOREACH_HumanPlayer( p ) { - m_sprMeterFrame[p].FinishTweening(); m_DifficultyIcon[p].FinishTweening(); } } diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 13d00d357d..1de7260736 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -92,7 +92,6 @@ protected: GrooveRadar m_GrooveRadar; BitmapText m_textNumSongs; BitmapText m_textTotalTime; - Sprite m_sprMeterFrame[NUM_PLAYERS]; DifficultyMeter m_DifficultyMeter[NUM_PLAYERS]; Sprite m_sprHighScoreFrame[NUM_PLAYERS]; BitmapText m_textHighScore[NUM_PLAYERS];