diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 3642afaf28..6be6dd3af6 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -485,11 +485,6 @@ DifficultyDisplayX=SCREEN_CENTER_X-35-SCREEN_WIDTH*0.6 DifficultyDisplayY=SCREEN_CENTER_Y-70 DifficultyDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 DifficultyDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -ShowRadar=1 -RadarX=SCREEN_CENTER_X-160 -RadarY=SCREEN_CENTER_Y+92 -RadarOnCommand= -RadarOffCommand= ScoreFrameP1X=SCREEN_CENTER_X-262+SCREEN_WIDTH*0.6 ScoreFrameP1Y=SCREEN_CENTER_Y+92 ScoreFrameP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 7b9af6730e..7baa48b938 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -66,7 +66,6 @@ ScreenSelectMusic::ScreenSelectMusic() void ScreenSelectMusic::Init() { SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" ); - SHOW_RADAR.Load( m_sName, "ShowRadar" ); DO_ROULETTE_ON_MENU_TIMER.Load( m_sName, "DoRouletteOnMenuTimer" ); ALIGN_MUSIC_BEATS.Load( m_sName, "AlignMusicBeat" ); CODES.Load( m_sName, "Codes" ); @@ -84,8 +83,6 @@ void ScreenSelectMusic::Init() ScreenWithMenuElements::Init(); - m_DisplayMode = GAMESTATE->IsCourseMode() ? DISPLAY_COURSES : DISPLAY_SONGS; - /* Cache: */ m_sSectionMusicPath = THEME->GetPathS(m_sName,"section music"); m_sSortMusicPath = THEME->GetPathS(m_sName,"sort music"); @@ -143,11 +140,6 @@ void ScreenSelectMusic::Init() COMMAND( m_sprCDTitleBack, "Back" ); this->AddChild( &m_sprCDTitleBack ); - m_GrooveRadar.SetName( "Radar" ); - SET_XY( m_GrooveRadar ); - if( SHOW_RADAR ) - this->AddChild( &m_GrooveRadar ); - m_textNumSongs.SetName( "NumSongs" ); m_textNumSongs.LoadFromFont( THEME->GetPathF(m_sName,"num songs") ); SET_XY( m_textNumSongs ); @@ -255,22 +247,6 @@ ScreenSelectMusic::~ScreenSelectMusic() } -void ScreenSelectMusic::TweenSongPartsOnScreen() -{ - m_GrooveRadar.StopTweening(); - m_GrooveRadar.TweenOnScreen(); -} - -void ScreenSelectMusic::TweenSongPartsOffScreen() -{ - m_GrooveRadar.TweenOffScreen(); -} - -void ScreenSelectMusic::SkipSongPartTweens() -{ - m_GrooveRadar.FinishTweening(); -} - void ScreenSelectMusic::TweenOnScreen() { ScreenWithMenuElements::TweenOnScreen(); @@ -280,26 +256,10 @@ void ScreenSelectMusic::TweenOnScreen() ON_COMMAND( m_DifficultyMeter[p] ); } - TweenSongPartsOnScreen(); - - switch( GAMESTATE->m_SortOrder ) - { - case SORT_ALL_COURSES: - case SORT_NONSTOP_COURSES: - case SORT_ONI_COURSES: - case SORT_ENDLESS_COURSES: - TweenSongPartsOffScreen(); - SkipSongPartTweens(); - break; - default: - break; - } - ON_COMMAND( m_Banner ); ON_COMMAND( m_DifficultyDisplay ); ON_COMMAND( m_sprCDTitleFront ); ON_COMMAND( m_sprCDTitleBack ); - ON_COMMAND( m_GrooveRadar ); ON_COMMAND( m_textNumSongs ); ON_COMMAND( m_textTotalTime ); ON_COMMAND( m_MusicWheel ); @@ -319,23 +279,10 @@ void ScreenSelectMusic::TweenOffScreen() { ScreenWithMenuElements::TweenOffScreen(); - switch( GAMESTATE->m_SortOrder ) - { - case SORT_ALL_COURSES: - case SORT_NONSTOP_COURSES: - case SORT_ONI_COURSES: - case SORT_ENDLESS_COURSES: - break; - default: - TweenSongPartsOffScreen(); - break; - } - OFF_COMMAND( m_Banner ); OFF_COMMAND( m_DifficultyDisplay ); OFF_COMMAND( m_sprCDTitleFront ); OFF_COMMAND( m_sprCDTitleBack ); - OFF_COMMAND( m_GrooveRadar ); OFF_COMMAND( m_textNumSongs ); OFF_COMMAND( m_textTotalTime ); OFF_COMMAND( m_MusicWheel ); @@ -352,39 +299,6 @@ void ScreenSelectMusic::TweenOffScreen() } -/* This hides elements that are only relevant when displaying a single song, - * and shows elements for course display. XXX: Allow different tween commands. */ -void ScreenSelectMusic::SwitchDisplayMode( DisplayMode dm ) -{ - if( m_DisplayMode == dm ) - return; - - // tween off - switch( m_DisplayMode ) - { - case DISPLAY_SONGS: - TweenSongPartsOffScreen(); - break; - case DISPLAY_COURSES: - break; - case DISPLAY_MODES: - break; - } - - // tween on - m_DisplayMode = dm; - switch( m_DisplayMode ) - { - case DISPLAY_SONGS: - TweenSongPartsOnScreen(); - break; - case DISPLAY_COURSES: - break; - case DISPLAY_MODES: - break; - } -} - void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort() { FOREACH_HumanPlayer( p ) @@ -392,22 +306,6 @@ void ScreenSelectMusic::TweenScoreOnAndOffAfterChangeSort() m_textHighScore[p].RunCommands( SCORE_SORT_CHANGE_COMMAND(p) ); m_sprHighScoreFrame[p].RunCommands( SCORE_FRAME_SORT_CHANGE_COMMAND(p) ); } - - switch( GAMESTATE->m_SortOrder ) - { - case SORT_ALL_COURSES: - case SORT_NONSTOP_COURSES: - case SORT_ONI_COURSES: - case SORT_ENDLESS_COURSES: - SwitchDisplayMode( DISPLAY_COURSES ); - break; - case SORT_MODE_MENU: - SwitchDisplayMode( DISPLAY_MODES ); - break; - default: - SwitchDisplayMode( DISPLAY_SONGS ); - break; - } } /* If bForce is true, the next request will be started even if it might cause a skip. */ @@ -1093,7 +991,6 @@ void ScreenSelectMusic::AfterStepsChange( const vector &vpns ) m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) ); m_DifficultyMeter[pn].SetFromGameState( pn ); - m_GrooveRadar.SetFromSteps( pn, pSteps ); m_MusicWheel.NotesOrTrailChanged( pn ); } } @@ -1123,7 +1020,6 @@ void ScreenSelectMusic::AfterTrailChange( const vector &vpns ) m_textHighScore[pn].SetText( ssprintf("%*i", NUM_SCORE_DIGITS, iScore) ); m_DifficultyMeter[pn].SetFromGameState( pn ); - m_GrooveRadar.SetEmpty( pn ); m_MusicWheel.NotesOrTrailChanged( pn ); } } diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 22613ee100..94c9bf8f84 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 "GrooveRadar.h" #include "DifficultyMeter.h" #include "DifficultyDisplay.h" #include "RageUtil_BackgroundLoader.h" @@ -48,11 +47,6 @@ protected: void TweenOnScreen(); void TweenOffScreen(); void TweenScoreOnAndOffAfterChangeSort(); - enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode; - void SwitchDisplayMode( DisplayMode dm ); - void TweenSongPartsOnScreen(); - void TweenSongPartsOffScreen(); - void SkipSongPartTweens(); void UpdateSelectButton(); void ChangeDifficulty( PlayerNumber pn, int dir ); @@ -69,7 +63,6 @@ protected: int m_iSelection[NUM_PLAYERS]; ThemeMetric SAMPLE_MUSIC_DELAY; - ThemeMetric SHOW_RADAR; ThemeMetric DO_ROULETTE_ON_MENU_TIMER; ThemeMetric ALIGN_MUSIC_BEATS; ThemeMetric CODES; @@ -87,7 +80,6 @@ protected: FadingBanner m_Banner; Sprite m_sprCDTitleFront, m_sprCDTitleBack; - GrooveRadar m_GrooveRadar; BitmapText m_textNumSongs; BitmapText m_textTotalTime; DifficultyMeter m_DifficultyMeter[NUM_PLAYERS];