From 3f16433261ba542e586b786dc30200a0586ba524 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 5 Jul 2012 15:12:57 -0500
Subject: [PATCH] [ScreenRanking] Don't clobber alpha values when applying
 colors in SetPage.

---
 Docs/Changelog_sm5.txt |  1 +
 src/ScreenRanking.cpp  | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 7fc28c5c3e..9d4b07e5bf 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -12,6 +12,7 @@ StepMania 5.0 ???? ?? | 20120???
 ----------
 * [ScreenRanking] Added "NextPage" command. "SwitchPage" command is
   now "SwitchedPage". [AJ]
+* [ScreenRanking] Don't clobber alpha values when applying colors in SetPage. [AJ]
 
 2012/07/03
 ----------
diff --git a/src/ScreenRanking.cpp b/src/ScreenRanking.cpp
index f05dab138a..2f63dd08de 100644
--- a/src/ScreenRanking.cpp
+++ b/src/ScreenRanking.cpp
@@ -226,16 +226,16 @@ float ScreenRanking::SetPage( const PageToShow &pts )
 
 	for( int l=0; l<NUM_RANKING_LINES; l++ )
 	{
-		m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+		m_textNames[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 
 		m_textScores[l].SetVisible( bShowScores );
-		m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+		m_textScores[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 		
 		m_textPoints[l].SetVisible( bShowPoints );
-		m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+		m_textPoints[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 		
 		m_textTime[l].SetVisible( bShowTime );
-		m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+		m_textTime[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 	}
 
 	switch( RANKING_TYPE )
@@ -264,8 +264,8 @@ float ScreenRanking::SetPage( const PageToShow &pts )
 
 				m_textNames[l].SetText( hs.GetDisplayName() );
 				m_textScores[l].SetText( ssprintf("%09i",hs.GetScore()) );
-				m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
-				m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+				m_textNames[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+				m_textScores[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 
 				if( bRecentHighScore )
 				{
@@ -313,10 +313,10 @@ float ScreenRanking::SetPage( const PageToShow &pts )
 					m_textTime[l].SetText( "" );
 					m_textScores[l].SetText( ssprintf("%09d",hs.GetScore()) );
 				}
-				m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
-				m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
-				m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
-				m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+				m_textNames[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+				m_textPoints[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+				m_textTime[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
+				m_textScores[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
 
 				if( bRecentHighScore )
 				{