From c098349af5811bd5c4ba2a579c59d657a85df26c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 3 Oct 2003 07:02:05 +0000 Subject: [PATCH] improve error output --- stepmania/src/ScreenOptionsMaster.cpp | 8 ++++---- stepmania/src/ScreenOptionsMaster.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp index 38580ea328..bf15417442 100644 --- a/stepmania/src/ScreenOptionsMaster.cpp +++ b/stepmania/src/ScreenOptionsMaster.cpp @@ -282,7 +282,7 @@ ScreenOptionsMaster::~ScreenOptionsMaster() 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. */ 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; } case ROW_STEP: @@ -369,7 +369,7 @@ void ScreenOptionsMaster::ImportOptions() if( row.bOneChoiceForAllPlayers ) { - int col = ImportOption( row, hand, 0 ); + int col = ImportOption( row, hand, 0, i ); m_iSelectedOption[0][i] = col; ASSERT( m_iSelectedOption[0][i] < (int)row.choices.size() ); } @@ -379,7 +379,7 @@ void ScreenOptionsMaster::ImportOptions() if( !GAMESTATE->IsHumanPlayer(pn) ) continue; - int col = ImportOption( row, hand, pn ); + int col = ImportOption( row, hand, pn, i ); m_iSelectedOption[pn][i] = col; ASSERT( m_iSelectedOption[pn][i] < (int)row.choices.size() ); } diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h index 57179d9d51..81731955fd 100644 --- a/stepmania/src/ScreenOptionsMaster.h +++ b/stepmania/src/ScreenOptionsMaster.h @@ -43,7 +43,7 @@ private: CString ConvertParamToThemeDifficulty( const CString &in ) const; 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 SetStep( OptionRow &row, OptionRowHandler &hand ); void SetConf( OptionRow &row, OptionRowHandler &hand, CString param, CString &TitleOut );