This commit is contained in:
Glenn Maynard
2006-01-15 23:33:29 +00:00
parent f4f0d604b3
commit 2ac3a986a0
3 changed files with 4 additions and 7 deletions
+2 -3
View File
@@ -579,10 +579,9 @@ void OptionRow::UpdateText()
} }
} }
void OptionRow::SetRowFocus( bool bRowHasFocus[NUM_PLAYERS] ) void OptionRow::SetRowHasFocus( PlayerNumber pn, bool bRowHasFocus )
{ {
FOREACH_PlayerNumber( p ) m_bRowHasFocus[pn] = bRowHasFocus;
m_bRowHasFocus[p] = bRowHasFocus[p];
} }
void OptionRow::UpdateEnabledDisabled() void OptionRow::UpdateEnabledDisabled()
+1 -1
View File
@@ -151,7 +151,7 @@ public:
void PositionUnderlines( PlayerNumber pn ); void PositionUnderlines( PlayerNumber pn );
void PositionIcons(); void PositionIcons();
void UpdateText(); void UpdateText();
void SetRowFocus( bool bRowHasFocus[NUM_PLAYERS] ); void SetRowHasFocus( PlayerNumber pn, bool bRowHasFocus );
void UpdateEnabledDisabled(); void UpdateEnabledDisabled();
int GetOneSelection( PlayerNumber pn, bool bAllowFail=false ) const; int GetOneSelection( PlayerNumber pn, bool bAllowFail=false ) const;
+1 -3
View File
@@ -540,11 +540,9 @@ void ScreenOptions::UpdateEnabledDisabled( int r )
{ {
OptionRow &row = *m_pRows[r]; OptionRow &row = *m_pRows[r];
bool bRowHasFocus[NUM_PLAYERS];
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
bRowHasFocus[pn] = GAMESTATE->IsHumanPlayer(pn) && m_iCurrentRow[pn] == (int)r; row.SetRowHasFocus( pn, GAMESTATE->IsHumanPlayer(pn) && m_iCurrentRow[pn] == (int)r );
row.SetRowFocus( bRowHasFocus );
row.UpdateEnabledDisabled(); row.UpdateEnabledDisabled();
} }