From e841ae7e1e8204206f822062424fb76d5fb77f38 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 15 Feb 2008 09:35:56 +0000 Subject: [PATCH] remove per-difficulty characters in favor of text coloring and stroke fonts. Not all themes are going to want coloring based on Difficulty (e.g. Pump) --- stepmania/src/DifficultyMeter.cpp | 9 +++------ stepmania/src/DifficultyMeter.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 01f24cfe95..44914ae376 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -60,11 +60,8 @@ void DifficultyMeter::Load( const RString &sType ) if( m_bShowTicks ) { + RString sChars = "10"; // on, off m_textTicks.SetName( "Ticks" ); - RString sChars; - for( unsigned i = 0; i < NUM_Difficulty; ++i ) - sChars += char(i + '0'); // 01234 - sChars += 'X'; // Off m_textTicks.LoadFromTextureAndChars( THEME->GetPathF(sType,"ticks"), sChars ); ActorUtil::LoadAllCommandsAndSetXYAndOnCommand( m_textTicks, sType ); this->AddChild( &m_textTicks ); @@ -181,8 +178,8 @@ void DifficultyMeter::SetInternal( const SetParams ¶ms ) if( m_bShowTicks ) { - char on = char(params.dc + '0'); - char off = 'X'; + char on = char('1'); + char off = '0'; RString sNewText; int iNumOn = min( (int)m_iMaxTicks, params.iMeter ); diff --git a/stepmania/src/DifficultyMeter.h b/stepmania/src/DifficultyMeter.h index 8ee4bd9deb..6f5c73ab9d 100644 --- a/stepmania/src/DifficultyMeter.h +++ b/stepmania/src/DifficultyMeter.h @@ -49,7 +49,7 @@ private: void SetInternal( const SetParams ¶ms ); AutoActor m_sprFrame; - BitmapText m_textTicks; /* XXXX000000 */ + BitmapText m_textTicks; /* 111100000 */ BitmapText m_textMeter; /* 3, 9 */ BitmapText m_textEditDescription;