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

improve error output

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-03 07:02:05 +00:00
parent 26d3f375e2
commit c098349af5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+4 -4
View File
@@ -282,7 +282,7 @@ ScreenOptionsMaster::~ScreenOptionsMaster()
delete [] m_OptionRowAlloc; delete [] m_OptionRowAlloc;
} }
int ScreenOptionsMaster::ImportOption( const OptionRow &row, const OptionRowHandler &hand, int pn ) int ScreenOptionsMaster::ImportOption( const OptionRow &row, const OptionRowHandler &hand, int pn, int rowno )
{ {
/* Figure out which selection is the default. */ /* Figure out which selection is the default. */
switch( hand.type ) switch( hand.type )
@@ -313,7 +313,7 @@ int ScreenOptionsMaster::ImportOption( const OptionRow &row, const OptionRowHand
} }
} }
ASSERT( ret != -1 ); RAGE_ASSERT_M( ret != -1, ssprintf("%s line %i (\"%s\"): couldn't find default", m_sName.c_str(), rowno, row.name.c_str()) );
return ret; return ret;
} }
case ROW_STEP: case ROW_STEP:
@@ -369,7 +369,7 @@ void ScreenOptionsMaster::ImportOptions()
if( row.bOneChoiceForAllPlayers ) if( row.bOneChoiceForAllPlayers )
{ {
int col = ImportOption( row, hand, 0 ); int col = ImportOption( row, hand, 0, i );
m_iSelectedOption[0][i] = col; m_iSelectedOption[0][i] = col;
ASSERT( m_iSelectedOption[0][i] < (int)row.choices.size() ); ASSERT( m_iSelectedOption[0][i] < (int)row.choices.size() );
} }
@@ -379,7 +379,7 @@ void ScreenOptionsMaster::ImportOptions()
if( !GAMESTATE->IsHumanPlayer(pn) ) if( !GAMESTATE->IsHumanPlayer(pn) )
continue; continue;
int col = ImportOption( row, hand, pn ); int col = ImportOption( row, hand, pn, i );
m_iSelectedOption[pn][i] = col; m_iSelectedOption[pn][i] = col;
ASSERT( m_iSelectedOption[pn][i] < (int)row.choices.size() ); ASSERT( m_iSelectedOption[pn][i] < (int)row.choices.size() );
} }
stepmania/src/ScreenOptionsMaster.h
+1 -1
View File
@@ -43,7 +43,7 @@ private:
CString ConvertParamToThemeDifficulty( const CString &in ) const; CString ConvertParamToThemeDifficulty( const CString &in ) const;
int ExportOption( const OptionRow &row, const OptionRowHandler &hand, int pn, int sel ); int ExportOption( const OptionRow &row, const OptionRowHandler &hand, int pn, int sel );
int ImportOption( const OptionRow &row, const OptionRowHandler &hand, int pn ); int ImportOption( const OptionRow &row, const OptionRowHandler &hand, int pn, int rowno );
void SetList( OptionRow &row, OptionRowHandler &hand, CString param, CString &TitleOut ); void SetList( OptionRow &row, OptionRowHandler &hand, CString param, CString &TitleOut );
void SetStep( OptionRow &row, OptionRowHandler &hand ); void SetStep( OptionRow &row, OptionRowHandler &hand );
void SetConf( OptionRow &row, OptionRowHandler &hand, CString param, CString &TitleOut ); void SetConf( OptionRow &row, OptionRowHandler &hand, CString param, CString &TitleOut );