From 7f7259ea382df211b3d2ff1d2a3d8ff40077be9d Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 10 Jul 2003 03:37:34 +0000
Subject: [PATCH] change ranking text to graphics

---
 stepmania/src/ScreenRanking.cpp | 38 +++++++++++++++------------------
 stepmania/src/ScreenRanking.h   |  4 ++--
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index c070407854..c4a10e7cc7 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -48,15 +48,11 @@ const ScreenMessage SM_HidePage			=	(ScreenMessage)(SM_User+68);
 
 ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
 {
-	m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking title") );
-	m_textCategory.EnableShadow( false );
-	m_textCategory.SetXY( CATEGORY_X, CATEGORY_Y );
-	this->AddChild( &m_textCategory );
+	m_sprCategory.SetXY( CATEGORY_X, CATEGORY_Y );
+	this->AddChild( &m_sprCategory );
 
-	m_textType.LoadFromFont( THEME->GetPathToF("ScreenRanking title") );
-	m_textType.EnableShadow( false );
-	m_textType.SetXY( TYPE_X, TYPE_Y );
-	this->AddChild( &m_textType );
+	m_sprType.SetXY( TYPE_X, TYPE_Y );
+	this->AddChild( &m_sprType );
 
 	for( int i=0; i<NUM_RANKING_LINES; i++ )
 	{
@@ -196,10 +192,10 @@ void ScreenRanking::SetPage( PageToShow pts )
 	{
 	case PageToShow::TYPE_CATEGORY:
 		{
-			m_textCategory.SetDiffuse( RageColor(1,1,1,1) );
-			m_textCategory.SetText( ssprintf("Type %c", 'A'+pts.category) );
-			m_textType.SetDiffuse( RageColor(1,1,1,1) );
-			m_textType.SetText( GameManager::NotesTypeToString(pts.nt) );
+			m_sprCategory.SetDiffuse( RageColor(1,1,1,1) );
+			m_sprCategory.Load( THEME->GetPathToG(ssprintf("ScreenRanking category %c", 'A'+pts.category)) );
+			m_sprType.SetDiffuse( RageColor(1,1,1,1) );
+			m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
 			for( int l=0; l<NUM_RANKING_LINES; l++ )
 			{
 				m_sprBullets[l].SetDiffuse( RageColor(1,1,1,1) );
@@ -236,11 +232,11 @@ void ScreenRanking::SetPage( PageToShow pts )
 		break;
 	case PageToShow::TYPE_COURSE:
 		{
-			m_textCategory.SetDiffuse( RageColor(1,1,1,1) );
-			m_textCategory.SetZoom(1);
-			m_textCategory.SetTextMaxWidth( CATEGORY_WIDTH, pts.pCourse->m_sName );
-			m_textType.SetDiffuse( RageColor(1,1,1,1) );
-			m_textType.SetText( GameManager::NotesTypeToString(pts.nt) );
+			m_sprCategory.SetDiffuse( RageColor(1,1,1,1) );
+			m_sprCategory.SetZoom(1);
+			m_sprCategory.Load( THEME->GetPathToG("ScreenRanking category "+pts.pCourse->m_sName) );
+			m_sprType.SetDiffuse( RageColor(1,1,1,1) );
+			m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
 			for( int l=0; l<NUM_RANKING_LINES; l++ )
 			{
 				m_sprBullets[l].SetDiffuse( RageColor(1,1,1,1) );
@@ -287,8 +283,8 @@ void ScreenRanking::SetPage( PageToShow pts )
 
 void ScreenRanking::TweenPageOnScreen()
 {
-	m_textCategory.FadeOn(0,"bounce right",0.5f);
-	m_textType.FadeOn(0.1f,"bounce right",0.5f);
+	m_sprCategory.FadeOn(0,"bounce right",0.5f);
+	m_sprType.FadeOn(0.1f,"bounce right",0.5f);
 
 	for( int l=0; l<NUM_RANKING_LINES; l++ )
 	{
@@ -302,8 +298,8 @@ void ScreenRanking::TweenPageOnScreen()
 
 void ScreenRanking::TweenPageOffScreen()
 {
-	m_textCategory.FadeOff(0,"fade",0.25f);
-	m_textType.FadeOff(0.1f,"fade",0.25f);
+	m_sprCategory.FadeOff(0,"fade",0.25f);
+	m_sprType.FadeOff(0.1f,"fade",0.25f);
 
 	for( int l=0; l<NUM_RANKING_LINES; l++ )
 	{
diff --git a/stepmania/src/ScreenRanking.h b/stepmania/src/ScreenRanking.h
index c9be7af507..c3fe289a55 100644
--- a/stepmania/src/ScreenRanking.h
+++ b/stepmania/src/ScreenRanking.h
@@ -39,8 +39,8 @@ protected:
 	void TweenPageOffScreen();
 
 
-	BitmapText m_textCategory;
-	BitmapText m_textType;
+	Sprite m_sprCategory;
+	Sprite m_sprType;
 	Sprite m_sprBullets[NUM_RANKING_LINES];
 	BitmapText m_textNames[NUM_RANKING_LINES];
 	BitmapText m_textScores[NUM_RANKING_LINES];	// for category