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

fix DifficultyList colors not properly set when scrolling over Roulette

Browse Source
This commit is contained in:
Chris Danford
2004-05-29 04:55:00 +00:00
parent 6ad780417e
commit 2fab068fe4
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/DifficultyList.cpp
+7 -2
View File
@@ -299,9 +299,14 @@ void DifficultyList::SetFromGameState()
row.m_dc = d; row.m_dc = d;
m_Lines[i].m_Meter.SetMeter( 3*(d), d ); m_Lines[i].m_Meter.SetFromMeterAndDifficulty( 3*(d), d );
m_Lines[i].m_Number.SetText( "?" );
m_Lines[i].m_Description.SetText( GetDifficultyString(d) ); m_Lines[i].m_Description.SetText( GetDifficultyString(d) );
m_Lines[i].m_Description.SetDiffuseColor( SONGMAN->GetDifficultyColor(d) );
m_Lines[i].m_Number.SetZoomX(1);
m_Lines[i].m_Number.SetDiffuseColor( SONGMAN->GetDifficultyColor(d) );
m_Lines[i].m_Number.SetText( "?" );
} }
} }
else else
stepmania/src/DifficultyMeter.cpp
+6 -6
View File
@@ -106,7 +106,7 @@ void DifficultyMeter::SetFromSteps( const Steps* pSteps )
return; return;
} }
SetMeter( pSteps->GetMeter(), pSteps->GetDifficulty() ); SetFromMeterAndDifficulty( pSteps->GetMeter(), pSteps->GetDifficulty() );
SetDifficulty( DifficultyToString( pSteps->GetDifficulty() ) ); SetDifficulty( DifficultyToString( pSteps->GetDifficulty() ) );
} }
@@ -135,7 +135,7 @@ void DifficultyMeter::SetFromCourse( const Course* pCourse, PlayerNumber pn )
else else
FakeDifficulty = DIFFICULTY_CHALLENGE; FakeDifficulty = DIFFICULTY_CHALLENGE;
SetMeter( meter, FakeDifficulty ); SetFromMeterAndDifficulty( meter, FakeDifficulty );
SetDifficulty( DifficultyToString(FakeDifficulty) + "Course" ); SetDifficulty( DifficultyToString(FakeDifficulty) + "Course" );
} }
@@ -144,7 +144,7 @@ void DifficultyMeter::Unset()
m_textFeet.SetEffectNone(); m_textFeet.SetEffectNone();
if( FEET_IS_DIFFICULTY_COLOR ) if( FEET_IS_DIFFICULTY_COLOR )
m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) ); m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) );
SetMeter( 0, DIFFICULTY_BEGINNER ); SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER );
SetDifficulty( "None" ); SetDifficulty( "None" );
} }
@@ -153,7 +153,7 @@ void DifficultyMeter::SetFromDifficulty( Difficulty dc )
m_textFeet.SetEffectNone(); m_textFeet.SetEffectNone();
if( FEET_IS_DIFFICULTY_COLOR ) if( FEET_IS_DIFFICULTY_COLOR )
m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) ); m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) );
SetMeter( 0, DIFFICULTY_BEGINNER ); SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER );
SetDifficulty( DifficultyToString( dc ) ); SetDifficulty( DifficultyToString( dc ) );
} }
@@ -162,7 +162,7 @@ void DifficultyMeter::SetFromCourseDifficulty( CourseDifficulty cd )
m_textFeet.SetEffectNone(); m_textFeet.SetEffectNone();
if( FEET_IS_DIFFICULTY_COLOR ) if( FEET_IS_DIFFICULTY_COLOR )
m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) ); m_textFeet.SetDiffuse( RageColor(0.8f,0.8f,0.8f,1) );
SetMeter( 0, DIFFICULTY_BEGINNER ); SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER );
SetDifficulty( CourseDifficultyToString( cd ) ); SetDifficulty( CourseDifficultyToString( cd ) );
} }
@@ -186,7 +186,7 @@ void DifficultyMeter::SetFromGameState( PlayerNumber pn )
} }
} }
void DifficultyMeter::SetMeter( int iMeter, Difficulty dc ) void DifficultyMeter::SetFromMeterAndDifficulty( int iMeter, Difficulty dc )
{ {
if( SHOW_FEET ) if( SHOW_FEET )
{ {
stepmania/src/DifficultyMeter.h
+4 -3
View File
@@ -28,14 +28,15 @@ public:
void Load(); void Load();
void SetFromGameState( PlayerNumber pn ); void SetFromGameState( PlayerNumber pn );
void SetFromDifficulty( Difficulty dc ); void SetFromMeterAndDifficulty( int iMeter, Difficulty dc );
void SetFromCourseDifficulty( CourseDifficulty cd );
void SetFromSteps( const Steps* pSteps ); void SetFromSteps( const Steps* pSteps );
void SetFromCourse( const Course* pCourse, PlayerNumber pn ); void SetFromCourse( const Course* pCourse, PlayerNumber pn );
void Unset(); void Unset();
void SetMeter( int iMeter, Difficulty dc );
private: private:
void SetFromDifficulty( Difficulty dc );
void SetFromCourseDifficulty( CourseDifficulty cd );
void SetDifficulty( CString diff ); void SetDifficulty( CString diff );
BitmapText m_textFeet; BitmapText m_textFeet;