From 26d3f375e250d2a44b7ea69d605b8f7d862bdee3 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 3 Oct 2003 06:34:34 +0000
Subject: [PATCH] cleanup

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

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index f0a1ad850a..20409b735a 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1953,9 +1953,7 @@ BannerHeight=184
 [LyricDisplay]
 InCommand=shadowlength,0;zoomy,0;spring,0.20;zoomy,1;
 OutCommand=linear,0.20;zoomy,0
-//Affects Lyrics PreSwipe 1 = no Swipe
-Alpha=.5 
-WashOut=2 //Bigger number = Larger effect
+WipeDimFactor=0.5,0.5,0.5,0.5
 
 [ScoreKeeperRave]
 AttackDurationSeconds=10
diff --git a/stepmania/src/LyricDisplay.cpp b/stepmania/src/LyricDisplay.cpp
index 71dde04733..d0c5fd4a7a 100644
--- a/stepmania/src/LyricDisplay.cpp
+++ b/stepmania/src/LyricDisplay.cpp
@@ -6,6 +6,7 @@
 
 #define IN_COMMAND		THEME->GetMetric("LyricDisplay","InCommand")
 #define OUT_COMMAND		THEME->GetMetric("LyricDisplay","OutCommand")
+#define WIPE_DIM_FACTOR	THEME->GetMetricC("LyricDisplay","WipeDimFactor")
 
 float g_TweenInTime, g_TweenOutTime;
 
@@ -98,15 +99,9 @@ void LyricDisplay::Update( float fDeltaTime )
 
 		RageColor color = GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_Color;
 		
-		float WashOut = THEME->GetMetricF("LyricDisplay","WashOut");//DW
-		if (WashOut == 0) WashOut = 1;
-		
 		if( i==0 )
-		{
-			for( int c=0; c<4; c++ )
-				color[c] /= WashOut;
-			color.a = THEME->GetMetricF("LyricDisplay","Alpha");//DW;
-		}
+			color *= WIPE_DIM_FACTOR;
+
 		m_textLyrics[i].SetDiffuse(color);
 
 		/* Crop the bottom layer of text away as we crop the top layer on.  That