From 1ad9214a53a935b759fe284217bd6ec9f98b2975 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 3 Sep 2002 22:59:53 +0000
Subject: [PATCH] fixes for missing/incorrectly named theme elements

---
 stepmania/Themes/default/metrics.ini | 4 ++--
 stepmania/src/OptionIcon.cpp         | 2 +-
 stepmania/src/ScreenEvaluation.cpp   | 4 ++--
 stepmania/src/ScreenSelectMusic.cpp  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index a862352234..bbfe2d1c5e 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -565,8 +565,8 @@ TextOffsetX=0
 TextOffsetY=0
 TextHAlign=1	// 0,1,2 = left,center,right
 TextVAlign=1	// 0,1,2 = top,middle,bottom
-TextWidth=128
-TextZoom=0.25
+TextWidth=64
+TextZoom=0.5
 Uppercase=1
 
 [OptionIconRow]
diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp
index 996cfb7d42..6102bbb8ae 100644
--- a/stepmania/src/OptionIcon.cpp
+++ b/stepmania/src/OptionIcon.cpp
@@ -40,7 +40,7 @@ OptionIcon::OptionIcon()
 
 void OptionIcon::Load( PlayerNumber pn, CString sText, bool bHeader )
 {
-	static CString sStopWords[] = { "OFF", "VISIBLE", "VIVID" };
+	static CString sStopWords[] = { "OFF", "VISIBLE", "VIVID", "STANDARD" };
 	const int iNumStopWords = sizeof(sStopWords)/sizeof(sStopWords[0]);
 	
 	for( int i=0; i<iNumStopWords; i++ )
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 4ee3df5ba3..43e74b6cfc 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -190,7 +190,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 		m_BannerWithFrame[0].SetXY( BANNER_X, BANNER_Y );
 		this->AddChild( &m_BannerWithFrame[0] );
 
-		m_textStage.LoadFromFont( THEME->GetPathTo("Fonts","evalstage") );
+		m_textStage.LoadFromFont( THEME->GetPathTo("Fonts","evaluation stage") );
 		m_textStage.TurnShadowOff();
 		m_textStage.SetXY( STAGE_X, STAGE_Y );
 		m_textStage.SetZoom( 0.5f );
@@ -375,7 +375,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 
 		for( l=0; l<NUM_JUDGE_LINES; l++ ) 
 		{
-			m_textJudgeNumbers[l][p].LoadFromFont( THEME->GetPathTo("Fonts","score numbers") );
+			m_textJudgeNumbers[l][p].LoadFromTextureAndChars( THEME->GetPathTo("Graphics","evaluation score numbers 7x2"), "01234 :56789%." );
 			m_textJudgeNumbers[l][p].TurnShadowOff();
 			m_textJudgeNumbers[l][p].SetXY( JUDGE_X(p,l), JUDGE_Y(l) );
 			m_textJudgeNumbers[l][p].SetZoom( 0.7f );
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 86223289c6..20d917a9ba 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -211,7 +211,7 @@ ScreenSelectMusic::ScreenSelectMusic()
 	this->AddChild( &m_MusicSortDisplay );
 
 
-	m_textHoldForOptions.LoadFromFont( THEME->GetPathTo("Fonts","select music stage") );
+	m_textHoldForOptions.LoadFromFont( THEME->GetPathTo("Fonts","select music hold") );
 	m_textHoldForOptions.SetXY( CENTER_X, CENTER_Y );
 	m_textHoldForOptions.SetText( "press START again for options" );
 	m_textHoldForOptions.SetZoom( 1 );