PositionIcons(pn)

This commit is contained in:
Glenn Maynard
2006-02-03 09:31:51 +00:00
parent ca738bcccf
commit 2e95edf9da
3 changed files with 11 additions and 13 deletions
+7 -10
View File
@@ -510,19 +510,16 @@ void OptionRow::PositionUnderlines( PlayerNumber pn )
}
}
void OptionRow::PositionIcons()
void OptionRow::PositionIcons( PlayerNumber pn )
{
FOREACH_HumanPlayer( p ) // foreach player
{
OptionIcon *pIcon = m_OptionIcons[p];
if( pIcon == NULL )
continue;
OptionIcon *pIcon = m_OptionIcons[pn];
if( pIcon == NULL )
return;
pIcon->SetX( m_pParentType->ICONS_X.GetValue(p) );
pIcon->SetX( m_pParentType->ICONS_X.GetValue(pn) );
/* XXX: this doesn't work since icon is an ActorFrame */
pIcon->SetDiffuse( RageColor(1,1,1, m_bHidden? 0.0f:1.0f) );
}
/* XXX: this doesn't work since icon is an ActorFrame */
pIcon->SetDiffuse( RageColor(1,1,1, m_bHidden? 0.0f:1.0f) );
}
/* This is called when the focus changes, to update "long row" text. */
+1 -1
View File
@@ -147,7 +147,7 @@ public:
void ChoicesChanged();
void PositionUnderlines( PlayerNumber pn );
void PositionIcons();
void PositionIcons( PlayerNumber pn );
void UpdateText( PlayerNumber pn );
void SetRowHasFocus( PlayerNumber pn, bool bRowHasFocus );
void UpdateEnabledDisabled();
+3 -2
View File
@@ -384,8 +384,9 @@ void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int
void ScreenOptions::PositionIcons()
{
for( unsigned i=0; i<m_pRows.size(); i++ ) // foreach options line
m_pRows[i]->PositionIcons();
FOREACH_HumanPlayer( pn ) // foreach player
for( unsigned i=0; i<m_pRows.size(); i++ ) // foreach options line
m_pRows[i]->PositionIcons( pn );
}
void ScreenOptions::RefreshIcons( int iRow, PlayerNumber pn )