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

Init() is only called by Load(); merge calls. Call it before setting m_cmds.

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-15 23:10:50 +00:00
parent 0e4e3aa932
commit e23bebcfa3
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRowHandler.cpp
-4
View File
@@ -81,7 +81,6 @@ public:
ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( command.m_vsArgs.size() == 2 );
ASSERT( sParam.size() ); ASSERT( sParam.size() );
Init();
defOut.Init(); defOut.Init();
if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( defOut, sParam ); return; } if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( defOut, sParam ); return; }
@@ -898,7 +897,6 @@ public:
ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( command.m_vsArgs.size() == 2 );
ASSERT( sParam.size() ); ASSERT( sParam.size() );
Init();
defOut.Init(); defOut.Init();
if( sParam == "EditStepsType" ) if( sParam == "EditStepsType" )
@@ -1000,7 +998,6 @@ public:
ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( command.m_vsArgs.size() == 2 );
ASSERT( sParam.size() ); ASSERT( sParam.size() );
Init();
defOut.Init(); defOut.Init();
if( sParam == "EditSteps" ) if( sParam == "EditSteps" )
@@ -1151,7 +1148,6 @@ public:
{ {
ASSERT( cmds.v.size() > 1 ); ASSERT( cmds.v.size() > 1 );
Init();
defOut.Init(); defOut.Init();
Commands temp = cmds; Commands temp = cmds;
stepmania/src/OptionRowHandler.h
+1
View File
@@ -25,6 +25,7 @@ public:
} }
virtual void Load( OptionRowDefinition &defOut, const Commands &cmds ) virtual void Load( OptionRowDefinition &defOut, const Commands &cmds )
{ {
Init();
m_cmds = cmds; m_cmds = cmds;
this->LoadInternal( defOut, cmds ); this->LoadInternal( defOut, cmds );
} }