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

re-enable VerifySelected assert

Browse Source
This commit is contained in:
Chris Danford
2005-03-08 17:53:16 +00:00
parent 7ab74cdd24
commit 1b9f3b5a61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+3 -2
View File
@@ -731,7 +731,7 @@ void OptionRow::HandleMessage( const CString& sMessage )
#define INSERT_ONE_BOOL_AT_FRONT_IF_NEEDED( vbSelected ) \ #define INSERT_ONE_BOOL_AT_FRONT_IF_NEEDED( vbSelected ) \
if( GetFirstItemGoesDown() ) \ if( GetFirstItemGoesDown() ) \
vbSelected.insert( vbSelected.begin(), false ); vbSelected.insert( vbSelected.begin(), false );
static void VerifySelected( SelectType st, const vector<bool> vbSelected ) static void VerifySelected( SelectType st, const vector<bool> &vbSelected )
{ {
int iNumSelected = 0; int iNumSelected = 0;
if( st == SELECT_ONE ) if( st == SELECT_ONE )
@@ -757,7 +757,7 @@ void OptionRow::ImportOptions( PlayerNumber pn )
ERASE_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[pn] ); ERASE_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[pn] );
m_pHand->ImportOption( m_RowDef, pn, m_vbSelected[pn] ); m_pHand->ImportOption( m_RowDef, pn, m_vbSelected[pn] );
INSERT_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[pn] ); INSERT_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[pn] );
//VerifySelected( m_RowDef.selectType, m_vbSelected[pn] ); VerifySelected( m_RowDef.selectType, m_vbSelected[pn] );
} }
void OptionRow::ImportOptions() void OptionRow::ImportOptions()
@@ -775,6 +775,7 @@ int OptionRow::ExportOptions( PlayerNumber pn )
int iChangeMask = 0; int iChangeMask = 0;
VerifySelected( m_RowDef.selectType, m_vbSelected[pn] );
ASSERT( m_vbSelected[pn].size() == m_RowDef.choices.size() ); ASSERT( m_vbSelected[pn].size() == m_RowDef.choices.size() );
ERASE_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[pn] ); ERASE_ONE_BOOL_AT_FRONT_IF_NEEDED( m_vbSelected[pn] );
iChangeMask |= m_pHand->ExportOption( m_RowDef, pn, m_vbSelected[pn] ); iChangeMask |= m_pHand->ExportOption( m_RowDef, pn, m_vbSelected[pn] );