From d87583c76e0e9be36e9991252270a8fb5f04a962 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 23 Jun 2005 02:42:31 +0000 Subject: [PATCH] remove m_GrooveGraph --- stepmania/src/ScreenSelectMusic.cpp | 14 -------------- stepmania/src/ScreenSelectMusic.h | 3 --- 2 files changed, 17 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index d2fea01736..abdc10d0e4 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -64,7 +64,6 @@ ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuEleme SONG_OPTIONS_EXTRA_COMMAND( m_sName, "SongOptionsExtraCommand" ), SAMPLE_MUSIC_DELAY( m_sName, "SampleMusicDelay" ), SHOW_RADAR( m_sName, "ShowRadar" ), - SHOW_GRAPH( m_sName, "ShowGraph" ), SHOW_PANES( m_sName, "ShowPanes" ), SHOW_DIFFICULTY_LIST( m_sName, "ShowDifficultyList" ), SHOW_COURSE_CONTENTS( m_sName, "ShowCourseContents" ), @@ -197,11 +196,6 @@ void ScreenSelectMusic::Init() if( SHOW_RADAR ) this->AddChild( &m_GrooveRadar ); - m_GrooveGraph.SetName( "Graph" ); - SET_XY( m_GrooveGraph ); - if( SHOW_GRAPH ) - this->AddChild( &m_GrooveGraph ); - m_textSongOptions.SetName( "SongOptions" ); m_textSongOptions.LoadFromFont( THEME->GetPathF("Common","normal") ); SET_XY( m_textSongOptions ); @@ -378,9 +372,7 @@ void ScreenSelectMusic::DrawPrimitives() void ScreenSelectMusic::TweenSongPartsOnScreen( bool Initial ) { m_GrooveRadar.StopTweening(); - m_GrooveGraph.StopTweening(); m_GrooveRadar.TweenOnScreen(); - m_GrooveGraph.TweenOnScreen(); if( SHOW_DIFFICULTY_LIST ) { if( Initial ) @@ -406,7 +398,6 @@ void ScreenSelectMusic::TweenSongPartsOnScreen( bool Initial ) void ScreenSelectMusic::TweenSongPartsOffScreen( bool Final ) { m_GrooveRadar.TweenOffScreen(); - m_GrooveGraph.TweenOffScreen(); if( SHOW_DIFFICULTY_LIST ) { if( Final ) @@ -460,7 +451,6 @@ void ScreenSelectMusic::TweenCoursePartsOffScreen( bool Final ) void ScreenSelectMusic::SkipSongPartTweens() { m_GrooveRadar.FinishTweening(); - m_GrooveGraph.FinishTweening(); if( SHOW_DIFFICULTY_LIST ) m_DifficultyList.FinishTweening(); @@ -507,7 +497,6 @@ void ScreenSelectMusic::TweenOnScreen() ON_COMMAND( m_sprCDTitleFront ); ON_COMMAND( m_sprCDTitleBack ); ON_COMMAND( m_GrooveRadar ); - ON_COMMAND( m_GrooveGraph ); ON_COMMAND( m_textSongOptions ); ON_COMMAND( m_textNumSongs ); ON_COMMAND( m_textTotalTime ); @@ -561,7 +550,6 @@ void ScreenSelectMusic::TweenOffScreen() OFF_COMMAND( m_sprCDTitleFront ); OFF_COMMAND( m_sprCDTitleBack ); OFF_COMMAND( m_GrooveRadar ); - OFF_COMMAND( m_GrooveGraph ); OFF_COMMAND( m_textSongOptions ); OFF_COMMAND( m_textNumSongs ); OFF_COMMAND( m_textTotalTime ); @@ -1537,8 +1525,6 @@ void ScreenSelectMusic::AfterMusicChange() if( pSong ) GAMESTATE->m_pPreferredSong = pSong; - m_GrooveGraph.SetFromSong( pSong ); - Course* pCourse = m_MusicWheel.GetSelectedCourse(); GAMESTATE->m_pCurCourse.Set( pCourse ); if( pCourse ) diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index f5ec9fa0a3..e319ce1ac6 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -12,7 +12,6 @@ #include "FadingBanner.h" #include "BPMDisplay.h" #include "GrooveRadar.h" -#include "GrooveGraph.h" #include "DifficultyIcon.h" #include "DifficultyMeter.h" #include "OptionIconRow.h" @@ -79,7 +78,6 @@ protected: ThemeMetric SONG_OPTIONS_EXTRA_COMMAND; ThemeMetric SAMPLE_MUSIC_DELAY; ThemeMetric SHOW_RADAR; - ThemeMetric SHOW_GRAPH; ThemeMetric SHOW_PANES; ThemeMetric SHOW_DIFFICULTY_LIST; ThemeMetric SHOW_COURSE_CONTENTS; @@ -108,7 +106,6 @@ protected: DifficultyIcon m_DifficultyIcon[NUM_PLAYERS]; Sprite m_AutoGenIcon[NUM_PLAYERS]; GrooveRadar m_GrooveRadar; - GrooveGraph m_GrooveGraph; BitmapText m_textSongOptions; BitmapText m_textNumSongs; BitmapText m_textTotalTime;