From 74e36431b45f9c88513254fa584c823b5b810ab2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 04:32:40 +0000 Subject: [PATCH] move Load functions together --- stepmania/src/OptionRow.cpp | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 27ac7eecda..38ea5167ac 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -184,6 +184,25 @@ void OptionRow::LoadNormal( OptionRowHandler *pHand, bool bFirstItemGoesDown ) InitText(); } +void OptionRow::LoadExit() +{ + m_RowType = OptionRow::RowType_Exit; + OptionRowHandler *pHand = OptionRowHandlerUtil::MakeNull(); + pHand->m_Def.m_selectType = SELECT_NONE; + pHand->m_Def.m_sName = EXIT_NAME; + pHand->m_Def.m_vsChoices.push_back( "Exit" ); + pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW; + pHand->m_Def.m_bOneChoiceForAllPlayers = true; + m_pHand = pHand; + FOREACH_PlayerNumber( p ) + { + vector &vbSelected = m_vbSelected[p]; + vbSelected.resize( m_pHand->m_Def.m_vsChoices.size(), false ); + } + + InitText(); +} + CString OptionRow::GetRowTitle() const { CString sLineName = m_pHand->m_Def.m_sName; @@ -486,25 +505,6 @@ void OptionRow::AfterImportOptions() m_textTitle->SetText( GetRowTitle() ); } -void OptionRow::LoadExit() -{ - OptionRowHandler *pHand = OptionRowHandlerUtil::MakeNull(); - pHand->m_Def.m_selectType = SELECT_NONE; - pHand->m_Def.m_sName = EXIT_NAME; - pHand->m_Def.m_vsChoices.push_back( "Exit" ); - pHand->m_Def.m_layoutType = LAYOUT_SHOW_ONE_IN_ROW; - pHand->m_Def.m_bOneChoiceForAllPlayers = true; - m_RowType = OptionRow::RowType_Exit; - m_pHand = pHand; - FOREACH_PlayerNumber( p ) - { - vector &vbSelected = m_vbSelected[p]; - vbSelected.resize( m_pHand->m_Def.m_vsChoices.size(), false ); - } - - InitText(); -} - void OptionRow::PositionUnderlines( PlayerNumber pn ) { vector &vpUnderlines = m_Underline[pn];