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

Previously, OptionRowHandler was owned and freed by

Browse Source 
ScreenOptionsMaster (and ScreenOptionsManageProfiles).
Make it owned by OptionRow; the only pointer to them
is where they're stored in the OptionRow.  This
eliminates the remaining association between m_OptionRowHandlers
and m_pRows; that was confusing, because they're in
different places, and aren't always the same size.  It
also simplifies using OptionRowHandlers.
This commit is contained in:
Glenn Maynard
2006-01-16 22:55:57 +00:00
parent 3f60d2e26a
commit 3c63e09ca3
7 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
+5 -9
View File
@@ -51,6 +51,7 @@ void ScreenOptionsMaster::Init()
vector<OptionRowDefinition> OptionRowDefs;
OptionRowDefs.resize( asLineNames.size() );
vector<OptionRowHandler*> OptionRowHandlers;
for( unsigned i = 0; i < asLineNames.size(); ++i )
{
CString sLineName = asLineNames[i];
@@ -63,22 +64,17 @@ void ScreenOptionsMaster::Init()
OptionRowHandler *pHand = OptionRowHandlerUtil::Make( cmds, def );
if( pHand == NULL )
RageException::Throw( "Invalid OptionRowHandler '%s' in %s::Line%i", cmds.GetOriginalCommandString().c_str(), m_sName.c_str(), i );
m_OptionRowHandlers.push_back( pHand );
OptionRowHandlers.push_back( pHand );
}
ASSERT( m_OptionRowHandlers.size() == asLineNames.size() );
ASSERT( OptionRowHandlers.size() == asLineNames.size() );
InitMenu( OptionRowDefs, m_OptionRowHandlers );
InitMenu( OptionRowDefs, OptionRowHandlers );
}
ScreenOptionsMaster::~ScreenOptionsMaster()
{
FOREACH( OptionRow*, m_pRows, r )
(*r)->DetachHandler();
FOREACH( OptionRowHandler*, m_OptionRowHandlers, h )
SAFE_DELETE( *h );
m_OptionRowHandlers.clear();
}
void ScreenOptionsMaster::ImportOptions( int r, const vector<PlayerNumber> &vpns )
@@ -91,7 +87,7 @@ void ScreenOptionsMaster::ImportOptions( int r, const vector<PlayerNumber> &vpns
void ScreenOptionsMaster::ExportOptions( int r, const vector<PlayerNumber> &vpns )
{
CHECKPOINT_M( ssprintf("%i/%i", r, int(m_OptionRowHandlers.size())) );
CHECKPOINT_M( ssprintf("%i/%i", r, int(m_pRows.size())) );
OptionRow &row = *m_pRows[r];
bool bRowHasFocus[NUM_PLAYERS];