actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source 
(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)
This commit is contained in:
Glenn Maynard
2006-01-18 23:32:51 +00:00
parent e310fdac0c
commit 127059874e
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+2 -8
View File
@@ -375,17 +375,11 @@ void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int
row.GetWidthXY( pn, iChoiceOnRow, iWidthOut, iXOut, iYOut ); 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() void ScreenOptions::PositionAllUnderlines()
{ {
for( unsigned r=0; r<m_pRows.size(); r++ ) for( unsigned r=0; r<m_pRows.size(); r++ )
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
PositionUnderlines( r, p ); m_pRows[r]->PositionUnderlines( p );
} }
void ScreenOptions::PositionIcons() void ScreenOptions::PositionIcons()
@@ -912,7 +906,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
else else
m_SoundToggleOff.Play(); m_SoundToggleOff.Play();
PositionUnderlines( iCurRow, pn ); m_pRows[iCurRow]->PositionUnderlines( pn );
RefreshIcons( iCurRow, pn ); RefreshIcons( iCurRow, pn );
if( row.GetFirstItemGoesDown() ) if( row.GetFirstItemGoesDown() )
stepmania/src/ScreenOptions.h
-1
View File
@@ -49,7 +49,6 @@ protected:
void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ) const; void GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int &iWidthOut, int &iXOut, int &iYOut ) const;
CString GetExplanationText( int iRow ) const; CString GetExplanationText( int iRow ) const;
void PositionUnderlines( int iRow, PlayerNumber pn );
void PositionAllUnderlines(); void PositionAllUnderlines();
void PositionIcons(); void PositionIcons();
void RefreshIcons( int iRow, PlayerNumber pn ); void RefreshIcons( int iRow, PlayerNumber pn );
stepmania/src/ScreenPlayerOptions.cpp
+1 -1
View File
@@ -115,7 +115,7 @@ void ScreenPlayerOptions::Input( const InputEventPlus &input )
vector<PlayerNumber> v; vector<PlayerNumber> v;
v.push_back( pn ); v.push_back( pn );
this->ImportOptions( r, v ); this->ImportOptions( r, v );
this->PositionUnderlines( r, pn ); m_pRows[r]->PositionUnderlines( pn );
this->UpdateDisqualified( r, pn ); this->UpdateDisqualified( r, pn );
} }
} }