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

[ScreenRanking] Don't clobber alpha values when applying colors in SetPage.

Browse Source
This commit is contained in:
AJ Kelly
2012-07-05 15:12:57 -05:00
parent 330dd89cb6
commit 3f16433261
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+1
View File
@@ -12,6 +12,7 @@ StepMania 5.0 ???? ?? | 20120???
---------- ----------
* [ScreenRanking] Added "NextPage" command. "SwitchPage" command is * [ScreenRanking] Added "NextPage" command. "SwitchPage" command is
now "SwitchedPage". [AJ] now "SwitchedPage". [AJ]
* [ScreenRanking] Don't clobber alpha values when applying colors in SetPage. [AJ]
2012/07/03 2012/07/03
---------- ----------
src/ScreenRanking.cpp
+10 -10
View File
@@ -226,16 +226,16 @@ float ScreenRanking::SetPage( const PageToShow &pts )
for( int l=0; l<NUM_RANKING_LINES; l++ ) for( int l=0; l<NUM_RANKING_LINES; l++ )
{ {
m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textNames[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textScores[l].SetVisible( bShowScores ); m_textScores[l].SetVisible( bShowScores );
m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textScores[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textPoints[l].SetVisible( bShowPoints ); m_textPoints[l].SetVisible( bShowPoints );
m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textPoints[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textTime[l].SetVisible( bShowTime ); m_textTime[l].SetVisible( bShowTime );
m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textTime[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
} }
switch( RANKING_TYPE ) switch( RANKING_TYPE )
@@ -264,8 +264,8 @@ float ScreenRanking::SetPage( const PageToShow &pts )
m_textNames[l].SetText( hs.GetDisplayName() ); m_textNames[l].SetText( hs.GetDisplayName() );
m_textScores[l].SetText( ssprintf("%09i",hs.GetScore()) ); m_textScores[l].SetText( ssprintf("%09i",hs.GetScore()) );
m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textNames[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textScores[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
if( bRecentHighScore ) if( bRecentHighScore )
{ {
@@ -313,10 +313,10 @@ float ScreenRanking::SetPage( const PageToShow &pts )
m_textTime[l].SetText( "" ); m_textTime[l].SetText( "" );
m_textScores[l].SetText( ssprintf("%09d",hs.GetScore()) ); m_textScores[l].SetText( ssprintf("%09d",hs.GetScore()) );
} }
m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textNames[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textPoints[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textTime[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) ); m_textScores[l].SetDiffuseColor( STEPS_TYPE_COLOR.GetValue(pts.colorIndex) );
if( bRecentHighScore ) if( bRecentHighScore )
{ {