From ce43aab77356341a36be3c14d52d37f89d71fd5d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Jan 2006 21:36:44 +0000 Subject: [PATCH] simplify Reload --- stepmania/src/OptionRow.cpp | 3 ++- stepmania/src/OptionRowHandler.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 2d2208837d..667d0bf7e9 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -878,7 +878,8 @@ void OptionRow::Reload( const OptionRowDefinition &def ) if( m_pHand == NULL ) m_RowDef = def; else - m_pHand->Reload( m_RowDef ); + m_pHand->Reload(); + m_RowDef = m_pHand->m_Def; ASSERT( !m_RowDef.m_vsChoices.empty() ); FOREACH_PlayerNumber( p ) diff --git a/stepmania/src/OptionRowHandler.h b/stepmania/src/OptionRowHandler.h index c4acc900d4..6747f1c2c2 100644 --- a/stepmania/src/OptionRowHandler.h +++ b/stepmania/src/OptionRowHandler.h @@ -31,7 +31,7 @@ public: this->LoadInternal( m_Def, cmds ); } virtual void LoadInternal( OptionRowDefinition &defOut, const Commands &cmds ) = 0; - virtual void Reload( OptionRowDefinition &defOut ) { this->Load(m_cmds); defOut = m_Def; } + virtual void Reload() { this->Load(m_cmds); } virtual void ImportOption( const OptionRowDefinition &row, const vector &vpns, vector vbSelectedOut[NUM_PLAYERS] ) const = 0; /* Returns an OPT mask. */ virtual int ExportOption( const OptionRowDefinition &def, const vector &vpns, const vector vbSelected[NUM_PLAYERS] ) const = 0;