diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 3746efc7e1..00551182db 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -64,7 +64,6 @@ const char* STATS_STRING[NUM_STATS_LINES] = #define SHOW_TOTAL_SCORE_AREA THEME->GetMetricB(m_sName,"ShowTotalScoreArea") #define SHOW_TIME_AREA THEME->GetMetricB(m_sName,"ShowTimeArea") #define SHOW_GRAPH_AREA THEME->GetMetricB(m_sName,"ShowGraphArea") -#define SHOW_COMBO_AREA THEME->GetMetricB(m_sName,"ShowComboArea") #define SHOW_PER_DIFFICULTY_AWARD THEME->GetMetricB(m_sName,"ShowPerDifficultyAward") #define SHOW_PEAK_COMBO_AWARD THEME->GetMetricB(m_sName,"ShowPeakComboAward") #define LIFE_GRAPH_START_HEIGHT THEME->GetMetricF(m_sName,"LifeGraphStartHeight") @@ -438,17 +437,6 @@ void ScreenEvaluation::Init() } } - if( SHOW_COMBO_AREA ) - { - FOREACH_EnabledPlayer( p ) - { - m_ComboGraph[p].SetName( ssprintf("ComboGraphP%i",p+1) ); - m_ComboGraph[p].Load( m_sName, ssprintf("ComboGraph p%i",p+1), m_StageStats, m_StageStats.m_player[p] ); - SET_XY_AND_ON_COMMAND( m_ComboGraph[p] ); - this->AddChild( &m_ComboGraph[p] ); - } - } - // // init grade area // @@ -1126,14 +1114,6 @@ void ScreenEvaluation::TweenOursOffScreen() } } - if( SHOW_COMBO_AREA ) - { - FOREACH_EnabledPlayer( p ) - { - OFF_COMMAND( m_ComboGraph[p] ); - } - } - // points area if( SHOW_POINTS_AREA ) { diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index ad530ea58a..41716a3fce 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -12,7 +12,6 @@ #include "DifficultyMeter.h" #include "PercentageDisplay.h" #include "GraphDisplay.h" -#include "ComboGraph.h" #include "ActorUtil.h" #include "HighScore.h" #include "RageSound.h" @@ -82,9 +81,6 @@ protected: AutoActor m_sprGraphFrame[NUM_PLAYERS]; GraphDisplay m_LifeGraph[NUM_PLAYERS]; - // combo area - ComboGraph m_ComboGraph[NUM_PLAYERS]; - // points area bool m_bNewSongsUnlocked; PercentageDisplay m_Percent[NUM_PLAYERS];