From eb759981ce828e90af0e88f276012b358852995f Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 10 Sep 2005 21:00:28 +0000
Subject: [PATCH] add ShowJudgmentLabels, ShowStatsLabels

---
 stepmania/Themes/default/metrics.ini |  2 ++
 stepmania/src/ScreenEvaluation.cpp   | 31 ++++++++++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 22d1cc11bd..ec64a9d304 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1205,12 +1205,14 @@ PlayerOptionsSeparator=,
 MaxComboNumDigits=4
 StyleIcon=1
 ShowBannerArea=1
+ShowJudgmentLabels=1
 ShowMarvelous=1
 ShowPerfect=1
 ShowGreat=1
 ShowGood=1
 ShowBoo=1
 ShowMiss=1
+ShowStatsLabels=1
 ShowOK=1
 ShowTotalError=0
 ShowJumps=0
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 545cef44ae..a52bfe23a8 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -59,7 +59,10 @@ const char* STATS_STRING[NUM_STATS_LINES] =
 #define SHOW_BONUS_AREA						THEME->GetMetricB(m_sName,"ShowBonusArea")
 #define SHOW_SURVIVED_AREA					THEME->GetMetricB(m_sName,"ShowSurvivedArea")
 #define SHOW_WIN_AREA						THEME->GetMetricB(m_sName,"ShowWinArea")
+#define SHOW_JUDGMENT_LABELS				THEME->GetMetricB(m_sName,"ShowJudgmentLabels")
 #define SHOW_JUDGMENT( l )					THEME->GetMetricB(m_sName,ssprintf("Show%s",JUDGE_STRING[l]))
+#define SHOW_STATS_LABELS					THEME->GetMetricB(m_sName,"ShowStatsLabels")
+
 #define SHOW_STAT( s )						THEME->GetMetricB(m_sName,ssprintf("Show%s",STATS_STRING[l]))
 #define SHOW_SCORE_AREA						THEME->GetMetricB(m_sName,"ShowScoreArea")
 #define SHOW_TOTAL_SCORE_AREA				THEME->GetMetricB(m_sName,"ShowTotalScoreArea")
@@ -524,12 +527,15 @@ void ScreenEvaluation::Init()
 
 		if( SHOW_JUDGMENT(l) )
 		{
-			m_sprJudgeLabels[l].Load( THEME->GetPathG(m_sName,"judge labels") );
-			m_sprJudgeLabels[l].StopAnimating();
-			m_sprJudgeLabels[l].SetState( l );
-			m_sprJudgeLabels[l].SetName( ssprintf("%sLabel",JUDGE_STRING[l]) );
-			SET_XY_AND_ON_COMMAND( m_sprJudgeLabels[l] );
-			this->AddChild( &m_sprJudgeLabels[l] );
+			if( SHOW_JUDGMENT_LABELS )
+			{
+				m_sprJudgeLabels[l].Load( THEME->GetPathG(m_sName,"judge labels") );
+				m_sprJudgeLabels[l].StopAnimating();
+				m_sprJudgeLabels[l].SetState( l );
+				m_sprJudgeLabels[l].SetName( ssprintf("%sLabel",JUDGE_STRING[l]) );
+				SET_XY_AND_ON_COMMAND( m_sprJudgeLabels[l] );
+				this->AddChild( &m_sprJudgeLabels[l] );
+			}
 
 			FOREACH_EnabledPlayer( p )
 			{
@@ -567,11 +573,14 @@ void ScreenEvaluation::Init()
 		if( !SHOW_STAT(l) )
 			continue;
 
-		m_sprStatsLabel[l].Load( THEME->GetPathG(m_sName,ssprintf("label %s", STATS_STRING[l])) );
-		m_sprStatsLabel[l]->StopAnimating();
-		m_sprStatsLabel[l]->SetName( ssprintf("%sLabel",STATS_STRING[l]) );
-		SET_XY_AND_ON_COMMAND( m_sprStatsLabel[l] );
-		this->AddChild( m_sprStatsLabel[l] );
+		if( SHOW_STATS_LABELS )
+		{
+			m_sprStatsLabel[l].Load( THEME->GetPathG(m_sName,ssprintf("label %s", STATS_STRING[l])) );
+			m_sprStatsLabel[l]->StopAnimating();
+			m_sprStatsLabel[l]->SetName( ssprintf("%sLabel",STATS_STRING[l]) );
+			SET_XY_AND_ON_COMMAND( m_sprStatsLabel[l] );
+			this->AddChild( m_sprStatsLabel[l] );
+		}
 
 		FOREACH_EnabledPlayer( p )
 		{