From b4c7ab6eb9df73e4b27425e1d73db71f34b7d001 Mon Sep 17 00:00:00 2001
From: Colby Klein <shakesoda@gmail.com>
Date: Sat, 3 Jan 2009 13:10:34 +0000
Subject: [PATCH] Add metric to show/hide skip display in stats.

---
 stepmania/Themes/default/metrics.ini |  2 +-
 stepmania/src/ScreenStatsOverlay.cpp | 59 +++++++++++++++-------------
 stepmania/src/ScreenStatsOverlay.h   |  1 +
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index cc19376101..f1d24c74c6 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1839,7 +1839,7 @@ Fallback="Screen"
 StatsX=SCREEN_RIGHT-8
 StatsY=SCREEN_TOP+10
 StatsOnCommand=horizalign,right;vertalign,top;shadowlength,1
-
+ShowSkips=true
 SkipX=SCREEN_RIGHT-100
 SkipY=SCREEN_BOTTOM-100
 SkipWidth=190
diff --git a/stepmania/src/ScreenStatsOverlay.cpp b/stepmania/src/ScreenStatsOverlay.cpp
index b04f8bc9b4..9cc7e0769c 100644
--- a/stepmania/src/ScreenStatsOverlay.cpp
+++ b/stepmania/src/ScreenStatsOverlay.cpp
@@ -23,34 +23,38 @@ void ScreenStatsOverlay::Init()
 	 * the time in the log. */
 	m_LastSkip = 0;
 
-	SKIP_X.Load( m_sName, "SkipX" );
-	SKIP_Y.Load( m_sName, "SkipY" );
-	SKIP_SPACING_Y.Load( m_sName, "SkipSpacingY" );
-	SKIP_WIDTH.Load( m_sName, "SkipWidth" );
-
-	RectF rectSkips = RectF(
-		SKIP_X-SKIP_WIDTH/2, 
-		SKIP_Y-(SKIP_SPACING_Y*NUM_SKIPS_TO_SHOW)/2 - 10, 
-		SKIP_X+SKIP_WIDTH/2, 
-		SKIP_Y+(SKIP_SPACING_Y*NUM_SKIPS_TO_SHOW)/2 + 10
-		);
-	m_quadSkipBackground.StretchTo( rectSkips );
-	m_quadSkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) );
-	this->AddChild(&m_quadSkipBackground);
-
-	for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ )
+	SHOW_SKIPS.Load( m_sName, "ShowSkips" );
+	if( SHOW_SKIPS )
 	{
-		/* This is somewhat big.  Let's put it on the right side, where it'll
-		 * obscure the 2P side during gameplay; there's nowhere to put it that
-		 * doesn't obscure something, and it's just a diagnostic. */
-		m_textSkips[i].LoadFromFont( THEME->GetPathF("Common","normal") );
-		m_textSkips[i].SetX( SKIP_X );
-		m_textSkips[i].SetY( 
-			SCALE( i, 0, NUM_SKIPS_TO_SHOW-1, rectSkips.top + 10, rectSkips.bottom - 10 ) 
+		SKIP_X.Load( m_sName, "SkipX" );
+		SKIP_Y.Load( m_sName, "SkipY" );
+		SKIP_SPACING_Y.Load( m_sName, "SkipSpacingY" );
+		SKIP_WIDTH.Load( m_sName, "SkipWidth" );
+		
+		RectF rectSkips = RectF(
+			SKIP_X-SKIP_WIDTH/2, 
+			SKIP_Y-(SKIP_SPACING_Y*NUM_SKIPS_TO_SHOW)/2 - 10, 
+			SKIP_X+SKIP_WIDTH/2, 
+			SKIP_Y+(SKIP_SPACING_Y*NUM_SKIPS_TO_SHOW)/2 + 10
 			);
-		m_textSkips[i].SetDiffuse( RageColor(1,1,1,0) );
-		m_textSkips[i].SetShadowLength( 0 );
-		this->AddChild( &m_textSkips[i] );
+		m_quadSkipBackground.StretchTo( rectSkips );
+		m_quadSkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) );
+		this->AddChild(&m_quadSkipBackground);
+
+		for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ )
+		{
+			/* This is somewhat big.  Let's put it on the right side, where it'll
+			 * obscure the 2P side during gameplay; there's nowhere to put it that
+			 * doesn't obscure something, and it's just a diagnostic. */
+			m_textSkips[i].LoadFromFont( THEME->GetPathF("Common","normal") );
+			m_textSkips[i].SetX( SKIP_X );
+			m_textSkips[i].SetY( 
+				SCALE( i, 0, NUM_SKIPS_TO_SHOW-1, rectSkips.top + 10, rectSkips.bottom - 10 ) 
+				);
+			m_textSkips[i].SetDiffuse( RageColor(1,1,1,0) );
+			m_textSkips[i].SetShadowLength( 0 );
+			this->AddChild( &m_textSkips[i] );
+		}
 	}
 
 	this->SubscribeToMessage( "ShowStatsChanged" );
@@ -74,7 +78,8 @@ void ScreenStatsOverlay::Update( float fDeltaTime )
 	if( PREFSMAN->m_bShowStats )
 	{
 		m_textStats.SetText( DISPLAY->GetStats() );
-		UpdateSkips();
+		if ( SHOW_SKIPS )
+			UpdateSkips();
 	}
 }
 
diff --git a/stepmania/src/ScreenStatsOverlay.h b/stepmania/src/ScreenStatsOverlay.h
index bce38b5c0a..59ac00f9f6 100644
--- a/stepmania/src/ScreenStatsOverlay.h
+++ b/stepmania/src/ScreenStatsOverlay.h
@@ -26,6 +26,7 @@ private:
 	RageTimer m_timerSkip;
 	int m_LastSkip;
 
+	ThemeMetric<bool>  SHOW_SKIPS;
 	ThemeMetric<float> SKIP_X;
 	ThemeMetric<float> SKIP_Y;
 	ThemeMetric<float> SKIP_SPACING_Y;