From b1cfe1bb7230e41e025ba43f170618c9fb836190 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 18 Jan 2006 00:09:11 +0000 Subject: [PATCH] unify m_Def.Init --- stepmania/src/OptionRowHandler.cpp | 10 ---------- stepmania/src/OptionRowHandler.h | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index 475f910801..646144ba9c 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -81,8 +81,6 @@ public: ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( sParam.size() ); - m_Def.Init(); - if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( sParam ); return; } else if( sParam.CompareNoCase("Steps")==0 ) { FillSteps( sParam, false ); return; } else if( sParam.CompareNoCase("StepsLocked")==0 ) { FillSteps( sParam, true ); return; } @@ -499,7 +497,6 @@ public: ASSERT( sLuaFunction.size() ); Init(); - m_Def.Init(); m_Def.m_bAllowThemeItems = false; // Lua options are always dynamic and can theme themselves. @@ -817,7 +814,6 @@ public: ASSERT( sParam.size() ); Init(); - m_Def.Init(); /* Configuration values are never per-player. */ m_Def.m_bOneChoiceForAllPlayers = true; @@ -897,8 +893,6 @@ public: ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( sParam.size() ); - m_Def.Init(); - if( sParam == "EditStepsType" ) { m_pstToFill = &GAMESTATE->m_stEdit; @@ -998,8 +992,6 @@ public: ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( sParam.size() ); - m_Def.Init(); - if( sParam == "EditSteps" ) { m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0]; @@ -1149,8 +1141,6 @@ public: { ASSERT( cmds.v.size() > 1 ); - m_Def.Init(); - Commands temp = cmds; temp.v.erase( temp.v.begin() ); m_gc.Load( 0, temp ); diff --git a/stepmania/src/OptionRowHandler.h b/stepmania/src/OptionRowHandler.h index 4313dcee3f..42e70e21d0 100644 --- a/stepmania/src/OptionRowHandler.h +++ b/stepmania/src/OptionRowHandler.h @@ -22,6 +22,7 @@ public: virtual void Init() { m_cmds.v.clear(); + m_Def.Init(); m_vsReloadRowMessages.clear(); } void Load( const Commands &cmds )