diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation disqualified.redir b/stepmania/Themes/default/Graphics/ScreenEvaluation disqualified.redir deleted file mode 100644 index 04b2ead777..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenEvaluation disqualified.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index de360b7c2e..403ae60b85 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1187,14 +1187,6 @@ Class=ScreenEvaluation FailedSoundTime=0 PassedSoundTime=0 NumSequenceSounds=0 -DisqualifiedP1X= -DisqualifiedP1Y= -DisqualifiedP1OnCommand=hidden,1 -DisqualifiedP1OffCommand= -DisqualifiedP2X= -DisqualifiedP2Y= -DisqualifiedP2OnCommand=hidden,1 -DisqualifiedP2OffCommand= DifficultyIconP1X= DifficultyIconP1Y= DifficultyIconP1OnCommand=hidden,1 diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index d9b6f1fc0d..802506491b 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -398,14 +398,6 @@ void ScreenEvaluation::Init() CString sPO = join( PLAYER_OPTIONS_SEPARATOR, v ); m_textPlayerOptions[p].SetText( sPO ); this->AddChild( &m_textPlayerOptions[p] ); - - if( GAMESTATE->IsDisqualified(p) ) - { - m_sprDisqualified[p].Load( THEME->GetPathG(m_sName,"disqualified") ); - m_sprDisqualified[p]->SetName( ssprintf("DisqualifiedP%d",p+1) ); - SET_XY_AND_ON_COMMAND( m_sprDisqualified[p] ); - this->AddChild( m_sprDisqualified[p] ); - } } } break; @@ -1063,7 +1055,6 @@ void ScreenEvaluation::TweenOursOffScreen() OFF_COMMAND( m_DifficultyIcon[p] ); OFF_COMMAND( m_DifficultyMeter[p] ); OFF_COMMAND( m_textPlayerOptions[p] ); - OFF_COMMAND( m_sprDisqualified[p] ); } // small banner area diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index db00772098..c7b702b5ab 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -67,7 +67,6 @@ protected: DifficultyIcon m_DifficultyIcon[NUM_PLAYERS]; DifficultyMeter m_DifficultyMeter[NUM_PLAYERS]; BitmapText m_textPlayerOptions[NUM_PLAYERS]; - AutoActor m_sprDisqualified[NUM_PLAYERS]; Banner m_SmallBanner[MAX_SONGS_TO_SHOW]; AutoActor m_sprSmallBannerFrame[MAX_SONGS_TO_SHOW];