From 43ee764fde83234366e220557f96f7135f035dcd Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 3 Mar 2007 01:54:46 +0000
Subject: [PATCH] remove unused DifficultyIcon.  Do this in Lua if wanted.

---
 stepmania/Themes/default/metrics.ini |  8 --------
 stepmania/src/ScreenEvaluation.cpp   | 10 ----------
 stepmania/src/ScreenEvaluation.h     |  2 --
 stepmania/src/ScreenNetEvaluation.h  |  2 ++
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index bb281edf1a..262a5e1c5e 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1061,14 +1061,6 @@ PlayerType="PlayerShared"
 Fallback="ScreenWithMenuElements"
 Class="ScreenEvaluation"
 Summary=false
-DifficultyIconP1X=
-DifficultyIconP1Y=
-DifficultyIconP1OnCommand=hidden,1
-DifficultyIconP1OffCommand=
-DifficultyIconP2X=
-DifficultyIconP2Y=
-DifficultyIconP2OnCommand=hidden,1
-DifficultyIconP2OffCommand=
 PlayerOptionsSeparator=","
 MaxComboNumDigits=4
 StyleIcon=true
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 6b75748398..212fd94ef1 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -313,16 +313,6 @@ void ScreenEvaluation::Init()
 		{
 			FOREACH_EnabledPlayer( p )
 			{
-				m_DifficultyIcon[p].Load( THEME->GetPathG(m_sName,"difficulty icons") );
-				if( GAMESTATE->IsCourseMode() )
-					m_DifficultyIcon[p].SetFromTrail( p, GAMESTATE->m_pCurTrail[p] );
-				else
-					m_DifficultyIcon[p].SetFromSteps( p, GAMESTATE->m_pCurSteps[p] );
-				m_DifficultyIcon[p].SetName( ssprintf("DifficultyIconP%d",p+1) );
-				ActorUtil::LoadAllCommands( m_DifficultyIcon[p], m_sName );
-				SET_XY( m_DifficultyIcon[p] );
-				this->AddChild( &m_DifficultyIcon[p] );
-				
 				m_textPlayerOptions[p].LoadFromFont( THEME->GetPathF(m_sName,"PlayerOptions") );
 				m_textPlayerOptions[p].SetName( ssprintf("PlayerOptionsP%d",p+1) );
 				ActorUtil::LoadAllCommands( m_textPlayerOptions[p], m_sName );
diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h
index 2089efa6a8..93bb17dcfa 100644
--- a/stepmania/src/ScreenEvaluation.h
+++ b/stepmania/src/ScreenEvaluation.h
@@ -8,7 +8,6 @@
 #include "BitmapText.h"
 #include "GradeDisplay.h"
 #include "Banner.h"
-#include "DifficultyIcon.h"
 #include "PercentageDisplay.h"
 #include "ActorUtil.h"
 #include "RageSound.h"
@@ -59,7 +58,6 @@ protected:
 	// banner area
 	Banner			m_LargeBanner;
 	AutoActor		m_sprLargeBannerFrame;
-	DifficultyIcon		m_DifficultyIcon[NUM_PLAYERS];
 	BitmapText		m_textPlayerOptions[NUM_PLAYERS];
 	Banner			m_SmallBanner[MAX_SONGS_TO_SHOW];
 	AutoActor		m_sprSmallBannerFrame[MAX_SONGS_TO_SHOW];
diff --git a/stepmania/src/ScreenNetEvaluation.h b/stepmania/src/ScreenNetEvaluation.h
index 366a959174..93e8175800 100644
--- a/stepmania/src/ScreenNetEvaluation.h
+++ b/stepmania/src/ScreenNetEvaluation.h
@@ -3,6 +3,7 @@
 #include "Quad.h"
 #include "BitmapText.h"
 #include "ScreenMessage.h"
+#include "DifficultyIcon.h"
 
 class ScreenNetEvaluation: public ScreenEvaluation
 {
@@ -20,6 +21,7 @@ protected:
 	void UpdateStats( );
 private:
 	Quad			m_rectUsersBG;
+	DifficultyIcon		m_DifficultyIcon[NUM_PLAYERS];
 
 	vector<BitmapText>		m_textUsers;
 	int				m_iCurrentPlayer;