From 127059874ece628967a46c0ffed087be47d7352b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 23:32:51 +0000 Subject: [PATCH] simplify (this stuff looks like overzealous abstraction, but I think most of it used to be more complicated code that was moved off into other classes, and the stubs were left behind) --- stepmania/src/ScreenOptions.cpp | 10 ++-------- stepmania/src/ScreenOptions.h | 1 - stepmania/src/ScreenPlayerOptions.cpp | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 968eb524c8..fe5565fc24 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -375,17 +375,11 @@ void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int row.GetWidthXY( pn, iChoiceOnRow, iWidthOut, iXOut, iYOut ); } -void ScreenOptions::PositionUnderlines( int r, PlayerNumber pn ) -{ - OptionRow &row = *m_pRows[r]; - row.PositionUnderlines( pn ); -} - void ScreenOptions::PositionAllUnderlines() { for( unsigned r=0; rPositionUnderlines( p ); } void ScreenOptions::PositionIcons() @@ -912,7 +906,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input ) else m_SoundToggleOff.Play(); - PositionUnderlines( iCurRow, pn ); + m_pRows[iCurRow]->PositionUnderlines( pn ); RefreshIcons( iCurRow, pn ); if( row.GetFirstItemGoesDown() ) diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h index 32af7d6429..72f41a8f17 100644 --- a/stepmania/src/ScreenOptions.h +++ b/stepmania/src/ScreenOptions.h @@ -49,7 +49,6 @@ protected: void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ) const; CString GetExplanationText( int iRow ) const; - void PositionUnderlines( int iRow, PlayerNumber pn ); void PositionAllUnderlines(); void PositionIcons(); void RefreshIcons( int iRow, PlayerNumber pn ); diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 1f7de0cea5..69cd9ba3bb 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -115,7 +115,7 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input ) vector v; v.push_back( pn ); this->ImportOptions( r, v ); - this->PositionUnderlines( r, pn ); + m_pRows[r]->PositionUnderlines( pn ); this->UpdateDisqualified( r, pn ); } }