Handle the map loops here.

Little concerned on this one due to deletion.

Consider this a hopeful target for a smart pointer.
This commit is contained in:
Jason Felds
2013-04-27 23:55:16 -04:00
parent 6d57d2fbf5
commit a351621303
+7 -8
View File
@@ -177,8 +177,8 @@ OptionsList::OptionsList()
OptionsList::~OptionsList() OptionsList::~OptionsList()
{ {
FOREACHM( RString, OptionRowHandler *, m_Rows, hand ) for (std::pair<RString const &, OptionRowHandler *> hand : m_Rows)
delete hand->second; delete hand.second;
} }
void OptionsList::Load( RString sType, PlayerNumber pn ) void OptionsList::Load( RString sType, PlayerNumber pn )
@@ -246,10 +246,9 @@ void OptionsList::Load( RString sType, PlayerNumber pn )
void OptionsList::Reset() void OptionsList::Reset()
{ {
/* Import options. */ /* Import options. */
FOREACHM( RString, OptionRowHandler *, m_Rows, hand ) for (std::pair<RString const &, OptionRowHandler *> hand : m_Rows)
{ {
RString sLineName = hand->first; ImportRow(hand.first);
ImportRow( sLineName );
} }
} }
@@ -680,10 +679,10 @@ bool OptionsList::Start()
GAMESTATE->ResetToDefaultSongOptions( ModsLevel_Preferred ); GAMESTATE->ResetToDefaultSongOptions( ModsLevel_Preferred );
/* Import options. */ /* Import options. */
FOREACHM( RString, OptionRowHandler *, m_Rows, hand ) for (std::pair<RString const &, OptionRowHandler *> hand : m_Rows)
{ {
ImportRow( hand->first ); ImportRow( hand.first );
SelectionsChanged( hand->first ); SelectionsChanged( hand.first );
} }
UpdateMenuFromSelections(); UpdateMenuFromSelections();