unify m_Def.Init
This commit is contained in:
@@ -81,8 +81,6 @@ public:
|
|||||||
ASSERT( command.m_vsArgs.size() == 2 );
|
ASSERT( command.m_vsArgs.size() == 2 );
|
||||||
ASSERT( sParam.size() );
|
ASSERT( sParam.size() );
|
||||||
|
|
||||||
m_Def.Init();
|
|
||||||
|
|
||||||
if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( sParam ); return; }
|
if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( sParam ); return; }
|
||||||
else if( sParam.CompareNoCase("Steps")==0 ) { FillSteps( sParam, false ); return; }
|
else if( sParam.CompareNoCase("Steps")==0 ) { FillSteps( sParam, false ); return; }
|
||||||
else if( sParam.CompareNoCase("StepsLocked")==0 ) { FillSteps( sParam, true ); return; }
|
else if( sParam.CompareNoCase("StepsLocked")==0 ) { FillSteps( sParam, true ); return; }
|
||||||
@@ -499,7 +497,6 @@ public:
|
|||||||
ASSERT( sLuaFunction.size() );
|
ASSERT( sLuaFunction.size() );
|
||||||
|
|
||||||
Init();
|
Init();
|
||||||
m_Def.Init();
|
|
||||||
|
|
||||||
m_Def.m_bAllowThemeItems = false; // Lua options are always dynamic and can theme themselves.
|
m_Def.m_bAllowThemeItems = false; // Lua options are always dynamic and can theme themselves.
|
||||||
|
|
||||||
@@ -817,7 +814,6 @@ public:
|
|||||||
ASSERT( sParam.size() );
|
ASSERT( sParam.size() );
|
||||||
|
|
||||||
Init();
|
Init();
|
||||||
m_Def.Init();
|
|
||||||
|
|
||||||
/* Configuration values are never per-player. */
|
/* Configuration values are never per-player. */
|
||||||
m_Def.m_bOneChoiceForAllPlayers = true;
|
m_Def.m_bOneChoiceForAllPlayers = true;
|
||||||
@@ -897,8 +893,6 @@ public:
|
|||||||
ASSERT( command.m_vsArgs.size() == 2 );
|
ASSERT( command.m_vsArgs.size() == 2 );
|
||||||
ASSERT( sParam.size() );
|
ASSERT( sParam.size() );
|
||||||
|
|
||||||
m_Def.Init();
|
|
||||||
|
|
||||||
if( sParam == "EditStepsType" )
|
if( sParam == "EditStepsType" )
|
||||||
{
|
{
|
||||||
m_pstToFill = &GAMESTATE->m_stEdit;
|
m_pstToFill = &GAMESTATE->m_stEdit;
|
||||||
@@ -998,8 +992,6 @@ public:
|
|||||||
ASSERT( command.m_vsArgs.size() == 2 );
|
ASSERT( command.m_vsArgs.size() == 2 );
|
||||||
ASSERT( sParam.size() );
|
ASSERT( sParam.size() );
|
||||||
|
|
||||||
m_Def.Init();
|
|
||||||
|
|
||||||
if( sParam == "EditSteps" )
|
if( sParam == "EditSteps" )
|
||||||
{
|
{
|
||||||
m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0];
|
m_ppStepsToFill = &GAMESTATE->m_pCurSteps[0];
|
||||||
@@ -1149,8 +1141,6 @@ public:
|
|||||||
{
|
{
|
||||||
ASSERT( cmds.v.size() > 1 );
|
ASSERT( cmds.v.size() > 1 );
|
||||||
|
|
||||||
m_Def.Init();
|
|
||||||
|
|
||||||
Commands temp = cmds;
|
Commands temp = cmds;
|
||||||
temp.v.erase( temp.v.begin() );
|
temp.v.erase( temp.v.begin() );
|
||||||
m_gc.Load( 0, temp );
|
m_gc.Load( 0, temp );
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public:
|
|||||||
virtual void Init()
|
virtual void Init()
|
||||||
{
|
{
|
||||||
m_cmds.v.clear();
|
m_cmds.v.clear();
|
||||||
|
m_Def.Init();
|
||||||
m_vsReloadRowMessages.clear();
|
m_vsReloadRowMessages.clear();
|
||||||
}
|
}
|
||||||
void Load( const Commands &cmds )
|
void Load( const Commands &cmds )
|
||||||
|
|||||||
Reference in New Issue
Block a user