actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add FEET_IS_DIFFICULTY_COLOR

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-16 22:34:03 +00:00
parent 5b55ce37f7
commit cb6ba495db
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DifficultyMeter.cpp
+8 -10
View File
@@ -30,7 +30,7 @@
#define SHOW_DIFFICULTY THEME->GetMetricB(m_sName,"ShowDifficulty") #define SHOW_DIFFICULTY THEME->GetMetricB(m_sName,"ShowDifficulty")
/* 3, 9 */ /* 3, 9 */
#define SHOW_METER THEME->GetMetricB(m_sName,"ShowMeter") #define SHOW_METER THEME->GetMetricB(m_sName,"ShowMeter")
#define FEET_IS_DIFFICULTY_COLOR THEME->GetMetricB(m_sName,"FeetIsDifficultyColor")
DifficultyMeter::DifficultyMeter() DifficultyMeter::DifficultyMeter()
{ {
@@ -95,9 +95,7 @@ void DifficultyMeter::SetFromNotes( const Steps* pNotes )
return; return;
} }
SetMeter( pNotes->GetMeter() ); SetMeter( pNotes->GetMeter(), pNotes->GetDifficulty() );
m_textFeet.SetDiffuse( SONGMAN->GetDifficultyColor(pNotes->GetDifficulty()) );
SetDifficulty( DifficultyToString( pNotes->GetDifficulty() ) ); SetDifficulty( DifficultyToString( pNotes->GetDifficulty() ) );
} }
@@ -110,7 +108,6 @@ void DifficultyMeter::SetFromCourse( const Course* pCourse )
} }
const int meter = (int) roundf(pCourse->GetMeter()); const int meter = (int) roundf(pCourse->GetMeter());
SetMeter( meter );
// XXX // XXX
Difficulty FakeDifficulty; Difficulty FakeDifficulty;
@@ -125,9 +122,7 @@ void DifficultyMeter::SetFromCourse( const Course* pCourse )
else else
FakeDifficulty = DIFFICULTY_CHALLENGE; FakeDifficulty = DIFFICULTY_CHALLENGE;
RageColor c = SONGMAN->GetDifficultyColor( FakeDifficulty ); SetMeter( meter, FakeDifficulty );
m_textFeet.SetDiffuse( c );
SetDifficulty( DifficultyToString(FakeDifficulty) + "Course" ); SetDifficulty( DifficultyToString(FakeDifficulty) + "Course" );
} }
@@ -135,7 +130,7 @@ void DifficultyMeter::Unset()
{ {
m_textFeet.SetEffectNone(); m_textFeet.SetEffectNone();
m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) ); m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) );
SetMeter( 0 ); SetMeter( 0, DIFFICULTY_BEGINNER );
SetDifficulty( "None" ); SetDifficulty( "None" );
} }
@@ -149,7 +144,7 @@ void DifficultyMeter::SetFromGameState( PlayerNumber pn )
Unset(); Unset();
} }
void DifficultyMeter::SetMeter( int iMeter ) void DifficultyMeter::SetMeter( int iMeter, Difficulty dc )
{ {
if( SHOW_FEET ) if( SHOW_FEET )
{ {
@@ -167,6 +162,9 @@ void DifficultyMeter::SetMeter( int iMeter )
m_textFeet.SetEffectGlowShift(); m_textFeet.SetEffectGlowShift();
else else
m_textFeet.SetEffectNone(); m_textFeet.SetEffectNone();
if( FEET_IS_DIFFICULTY_COLOR )
m_textFeet.SetDiffuse( SONGMAN->GetDifficultyColor( dc ) );
} }
if( SHOW_METER ) if( SHOW_METER )
stepmania/src/DifficultyMeter.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
void Unset(); void Unset();
private: private:
void SetMeter( int iMeter ); void SetMeter( int iMeter, Difficulty dc );
void SetDifficulty( CString diff ); void SetDifficulty( CString diff );
BitmapText m_textFeet; BitmapText m_textFeet;