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

all option rows have handlers

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-17 22:06:00 +00:00
parent b6a49fab47
commit fd54367ea7
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+4 -16
View File
@@ -103,11 +103,8 @@ void OptionRow::Clear()
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
m_Underline[p].clear(); m_Underline[p].clear();
if( m_pHand ) FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
{ MESSAGEMAN->Unsubscribe( this, *m );
FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
MESSAGEMAN->Unsubscribe( this, *m );
}
SAFE_DELETE( m_pHand ); SAFE_DELETE( m_pHand );
m_bFirstItemGoesDown = false; m_bFirstItemGoesDown = false;
@@ -160,11 +157,8 @@ void OptionRow::LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown )
m_pHand = pHand; m_pHand = pHand;
m_bFirstItemGoesDown = bFirstItemGoesDown; m_bFirstItemGoesDown = bFirstItemGoesDown;
if( m_pHand ) FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
{ MESSAGEMAN->Subscribe( this, *m );
FOREACH_CONST( CString, m_pHand->m_vsReloadRowMessages, m )
MESSAGEMAN->Subscribe( this, *m );
}
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
@@ -965,9 +959,6 @@ void OptionRow::HandleMessage( const CString& sMessage )
void OptionRow::ImportOptions( const vector<PlayerNumber> &vpns ) void OptionRow::ImportOptions( const vector<PlayerNumber> &vpns )
{ {
if( m_pHand == NULL )
return;
ASSERT( m_RowDef.m_vsChoices.size() > 0 ); ASSERT( m_RowDef.m_vsChoices.size() > 0 );
FOREACH_CONST( PlayerNumber, vpns, iter ) FOREACH_CONST( PlayerNumber, vpns, iter )
@@ -994,9 +985,6 @@ void OptionRow::ImportOptions( const vector<PlayerNumber> &vpns )
int OptionRow::ExportOptions( const vector<PlayerNumber> &vpns, bool bRowHasFocus[NUM_PLAYERS] ) int OptionRow::ExportOptions( const vector<PlayerNumber> &vpns, bool bRowHasFocus[NUM_PLAYERS] )
{ {
if( m_pHand == NULL )
return 0;
ASSERT( m_RowDef.m_vsChoices.size() > 0 ); ASSERT( m_RowDef.m_vsChoices.size() > 0 );
int iChangeMask = 0; int iChangeMask = 0;