pull pn loop out of UpdateText

This commit is contained in:
Glenn Maynard
2006-01-19 01:00:13 +00:00
parent b98fa213b5
commit 24cd1d3242
+4 -4
View File
@@ -492,7 +492,8 @@ void OptionRow::AfterImportOptions()
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
PositionUnderlines( p ); PositionUnderlines( p );
UpdateText(); FOREACH_HumanPlayer( p )
UpdateText();
m_textTitle->SetText( GetRowTitle() ); m_textTitle->SetText( GetRowTitle() );
} }
@@ -546,17 +547,16 @@ void OptionRow::PositionIcons()
} }
} }
void OptionRow::UpdateText() void OptionRow::UpdateText( PlayerNumber p )
{ {
switch( m_pHand->m_Def.m_layoutType ) switch( m_pHand->m_Def.m_layoutType )
{ {
case LAYOUT_SHOW_ONE_IN_ROW: case LAYOUT_SHOW_ONE_IN_ROW:
FOREACH_HumanPlayer( p )
{ {
unsigned pn = m_pHand->m_Def.m_bOneChoiceForAllPlayers ? 0 : p; unsigned pn = m_pHand->m_Def.m_bOneChoiceForAllPlayers ? 0 : p;
int iChoiceWithFocus = m_iChoiceInRowWithFocus[pn]; int iChoiceWithFocus = m_iChoiceInRowWithFocus[pn];
if( iChoiceWithFocus == -1 ) if( iChoiceWithFocus == -1 )
continue; break;
CString sText = m_pHand->m_Def.m_vsChoices[iChoiceWithFocus]; CString sText = m_pHand->m_Def.m_vsChoices[iChoiceWithFocus];
PrepareItemText( sText ); PrepareItemText( sText );