From 5cd3d22759066c168702a3c9751a473ba951593f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Sep 2005 04:12:16 +0000 Subject: [PATCH] Don't put fonts in Graphics, even ones that don't look like them; it's brittle (too easy to miss when changing font rules). --- stepmania/src/CourseEntryDisplay.cpp | 2 +- stepmania/src/DifficultyMeter.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/stepmania/src/CourseEntryDisplay.cpp b/stepmania/src/CourseEntryDisplay.cpp index 1fcbae356b..d0d236d251 100644 --- a/stepmania/src/CourseEntryDisplay.cpp +++ b/stepmania/src/CourseEntryDisplay.cpp @@ -52,7 +52,7 @@ void CourseEntryDisplay::Load() continue; // skip m_textFoot[pn].SetName( SEPARATE_COURSE_METERS? ssprintf("FootP%i", pn+1):CString("Foot") ); - m_textFoot[pn].LoadFromTextureAndChars( THEME->GetPathG("CourseEntryDisplay","difficulty 2x1"),"10" ); + m_textFoot[pn].LoadFromTextureAndChars( THEME->GetPathF("CourseEntryDisplay","difficulty"),"10" ); SET_XY_AND_ON_COMMAND( &m_textFoot[pn] ); this->AddChild( &m_textFoot[pn] ); diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 10ff727a7a..57765ede82 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -73,8 +73,7 @@ void DifficultyMeter::Load( const CString &sType ) { Feet = "0X"; } - int iNumFrames = m_bAutoColorFeet ? 2 : NUM_DIFFICULTIES+1; - m_textFeet.LoadFromTextureAndChars( THEME->GetPathG(sType,ssprintf("bar %dx1",iNumFrames)), Feet ); + m_textFeet.LoadFromTextureAndChars( THEME->GetPathF(sType,"bar"), Feet ); ActorUtil::SetXYAndOnCommand( m_textFeet, sType ); this->AddChild( &m_textFeet ); }