simplify
This commit is contained in:
@@ -517,18 +517,18 @@ void OptionRow::PositionUnderlines( PlayerNumber pn )
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Don't tween X movement and color changes. */
|
/* Don't tween X movement and color changes. */
|
||||||
|
ul.StopTweening();
|
||||||
|
|
||||||
int iWidth, iX, iY;
|
int iWidth, iX, iY;
|
||||||
GetWidthXY( pn, iChoiceWithFocus, iWidth, iX, iY );
|
GetWidthXY( pn, iChoiceWithFocus, iWidth, iX, iY );
|
||||||
ul.SetGlobalX( (float)iX );
|
ul.SetX( (float)iX );
|
||||||
ul.SetGlobalDiffuseColor( RageColor(1,1,1,1) );
|
ul.SetDiffuse( RageColor(1,1,1,fAlpha) );
|
||||||
|
|
||||||
ASSERT( m_vbSelected[pnTakeSelectedFrom].size() == m_pHand->m_Def.m_vsChoices.size() );
|
ASSERT( m_vbSelected[pnTakeSelectedFrom].size() == m_pHand->m_Def.m_vsChoices.size() );
|
||||||
|
|
||||||
bool bSelected = (iChoiceWithFocus==-1) ? false : m_vbSelected[pnTakeSelectedFrom][ iChoiceWithFocus ];
|
bool bSelected = (iChoiceWithFocus==-1) ? false : m_vbSelected[pnTakeSelectedFrom][ iChoiceWithFocus ];
|
||||||
bool bHidden = !bSelected || !GAMESTATE->IsHumanPlayer(pn);
|
bool bHidden = !bSelected || !GAMESTATE->IsHumanPlayer(pn);
|
||||||
|
|
||||||
ul.StopTweening();
|
|
||||||
ul.SetDiffuseAlpha( fAlpha );
|
|
||||||
ul.BeginTweening( m_pParentType->TWEEN_SECONDS );
|
ul.BeginTweening( m_pParentType->TWEEN_SECONDS );
|
||||||
ul.SetHidden( bHidden );
|
ul.SetHidden( bHidden );
|
||||||
ul.SetBarWidth( iWidth );
|
ul.SetBarWidth( iWidth );
|
||||||
|
|||||||
Reference in New Issue
Block a user