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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-05 17:13:42 +00:00
parent 97a449a9a6
commit 4185fb165f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMapControllers.cpp
+6 -5
View File
@@ -310,12 +310,13 @@ void ScreenMapControllers::Refresh()
{ {
bool bSelected = p == m_iCurController && b == m_iCurButton && s == m_iCurSlot; bool bSelected = p == m_iCurController && b == m_iCurButton && s == m_iCurSlot;
BitmapText *pText = &m_textMappedTo[p][b][s];
GameInput cur_gi( (GameController)p, (GameButton)b ); GameInput cur_gi( (GameController)p, (GameButton)b );
DeviceInput di; DeviceInput di;
if( INPUTMAPPER->GameToDevice( cur_gi, s, di ) ) if( INPUTMAPPER->GameToDevice( cur_gi, s, di ) )
m_textMappedTo[p][b][s].SetText( di.toString() ); pText->SetText( di.toString() );
else else
m_textMappedTo[p][b][s].SetText( "-----------" ); pText->SetText( "-----------" );
// highlight the currently selected pad button // highlight the currently selected pad button
RageColor color; RageColor color;
@@ -338,11 +339,11 @@ void ScreenMapControllers::Refresh()
color = RageColor(0.5,0.5,0.5,1); // gray color = RageColor(0.5,0.5,0.5,1); // gray
bPulse = false; bPulse = false;
} }
m_textMappedTo[p][b][s].SetDiffuse( color ); pText->SetDiffuse( color );
if( bPulse ) if( bPulse )
m_textMappedTo[p][b][s].SetEffectPulse( .5f, .5f, .6f ); pText->SetEffectPulse( .5f, .5f, .6f );
else else
m_textMappedTo[p][b][s].StopEffect(); pText->StopEffect();
} }
} }
} }