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

simplify Reload

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-17 21:36:44 +00:00
parent 39509ccb49
commit ce43aab773
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+2 -1
View File
@@ -878,7 +878,8 @@ void OptionRow::Reload( const OptionRowDefinition &def )
if( m_pHand == NULL ) if( m_pHand == NULL )
m_RowDef = def; m_RowDef = def;
else else
m_pHand->Reload( m_RowDef ); m_pHand->Reload();
m_RowDef = m_pHand->m_Def;
ASSERT( !m_RowDef.m_vsChoices.empty() ); ASSERT( !m_RowDef.m_vsChoices.empty() );
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
stepmania/src/OptionRowHandler.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
this->LoadInternal( m_Def, cmds ); this->LoadInternal( m_Def, cmds );
} }
virtual void LoadInternal( OptionRowDefinition &defOut, const Commands &cmds ) = 0; 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<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const = 0; virtual void ImportOption( const OptionRowDefinition &row, const vector<PlayerNumber> &vpns, vector<bool> vbSelectedOut[NUM_PLAYERS] ) const = 0;
/* Returns an OPT mask. */ /* Returns an OPT mask. */
virtual int ExportOption( const OptionRowDefinition &def, const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const = 0; virtual int ExportOption( const OptionRowDefinition &def, const vector<PlayerNumber> &vpns, const vector<bool> vbSelected[NUM_PLAYERS] ) const = 0;