diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 5924daa93d..c1e4509379 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -507,18 +507,6 @@ void ScreenOptions::TweenCursor( PlayerNumber pn ) } } -/* For "long row-style" rows, update the text on screen to contain the currently- - * focused options. - * - * This used to update a single player, but it's not always clear what that means - * when dealing with bOneChoiceForAllPlayers and disabled players, which was brittle. - * Update the whole row. */ -void ScreenOptions::UpdateText( int iRow ) -{ - OptionRow &row = *m_pRows[iRow]; - row.UpdateText(); -} - void ScreenOptions::UpdateEnabledDisabled( int r ) { OptionRow &row = *m_pRows[r]; @@ -1131,7 +1119,9 @@ void ScreenOptions::ChangeValueInRowRelative( int iRow, PlayerNumber pn, int iDe } } - UpdateText( iRow ); + /* For "long row-style" rows, update the text on screen to contain the newly- + * focused options. */ + m_pRows[iRow]->UpdateText(); // XXX: What was this NAV_THREE_KEY_MENU special case for? if( bOneChanged ) diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 3d3a315146..9186ab0486 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -57,7 +57,6 @@ protected: void PositionCursors(); void PositionRows(); void TweenCursor( PlayerNumber pn ); - void UpdateText( int iRow ); void UpdateEnabledDisabled(); void UpdateEnabledDisabled( int iRow ); void StoreFocus( PlayerNumber pn );