From e8c5ac24a2ceaaa30919df8138e43d1fc1d2b8cb Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 04:00:58 +0000 Subject: [PATCH] Fix up Reload: re-add NextRow, do re-import (or the m_iChoiceInRowWithFocus code is meaningless) --- stepmania/src/OptionRow.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 5d60dc7205..a1166ace34 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -897,14 +897,20 @@ void OptionRow::Reload() if( !m_pHand->Reload() ) break; - m_pHand->m_Def = m_pHand->m_Def; ASSERT( !m_pHand->m_Def.m_vsChoices.empty() ); FOREACH_PlayerNumber( p ) m_vbSelected[p].resize( m_pHand->m_Def.m_vsChoices.size(), false ); - // TODO: Nothing uses this yet and it causes skips when changing options. - //ImportOptions( vpns ); + // TRICKY: Insert a down arrow as the first choice in the row. + if( m_bFirstItemGoesDown ) + { + m_pHand->m_Def.m_vsChoices.insert( m_pHand->m_Def.m_vsChoices.begin(), NEXT_ROW_NAME ); + FOREACH_PlayerNumber( p ) + m_vbSelected[p].insert( m_vbSelected[p].begin(), false ); + } + + ImportOptions( vpns ); switch( m_pHand->m_Def.m_selectType ) {