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

These code paths all call Init() and defOut.Init, including

Browse Source 
the fall-through case.  Merge them.  (They're all a little
wrong: they clear m_cmds, which causes a crash later in
ImportOption on the error case, which is what I'm really
trying to fix ...)
This commit is contained in:
Glenn Maynard
2006-01-15 23:03:31 +00:00
parent 2517ced11c
commit 0e4e3aa932
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRowHandler.cpp
+3 -24
View File
@@ -81,6 +81,9 @@ public:
ASSERT( command.m_vsArgs.size() == 2 ); ASSERT( command.m_vsArgs.size() == 2 );
ASSERT( sParam.size() ); ASSERT( sParam.size() );
Init();
defOut.Init();
if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( defOut, sParam ); return; } if( sParam.CompareNoCase("NoteSkins")==0 ) { FillNoteSkins( defOut, sParam ); return; }
else if( sParam.CompareNoCase("Steps")==0 ) { FillSteps( defOut, sParam, false ); return; } else if( sParam.CompareNoCase("Steps")==0 ) { FillSteps( defOut, sParam, false ); return; }
else if( sParam.CompareNoCase("StepsLocked")==0 ) { FillSteps( defOut, sParam, true ); return; } else if( sParam.CompareNoCase("StepsLocked")==0 ) { FillSteps( defOut, sParam, true ); return; }
@@ -90,9 +93,6 @@ public:
else if( sParam.CompareNoCase("Difficulties")==0 ) { FillDifficulties( defOut, sParam ); return; } else if( sParam.CompareNoCase("Difficulties")==0 ) { FillDifficulties( defOut, sParam ); return; }
else if( sParam.CompareNoCase("SongsInCurrentSongGroup")==0 ) { FillSongsInCurrentSongGroup( defOut, sParam ); return; } else if( sParam.CompareNoCase("SongsInCurrentSongGroup")==0 ) { FillSongsInCurrentSongGroup( defOut, sParam ); return; }
Init();
defOut.Init();
m_bUseModNameForIcon = true; m_bUseModNameForIcon = true;
defOut.m_sName = sParam; defOut.m_sName = sParam;
@@ -270,9 +270,6 @@ public:
void FillNoteSkins( OptionRowDefinition &defOut, CString sParam ) void FillNoteSkins( OptionRowDefinition &defOut, CString sParam )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
defOut.m_sName = "NoteSkins"; defOut.m_sName = "NoteSkins";
@@ -292,9 +289,6 @@ public:
void FillSteps( OptionRowDefinition &defOut, CString sParam, bool bLockedTogether ) void FillSteps( OptionRowDefinition &defOut, CString sParam, bool bLockedTogether )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
defOut.m_sName = "Steps"; defOut.m_sName = "Steps";
@@ -353,9 +347,6 @@ public:
void FillCharacters( OptionRowDefinition &defOut, CString sParam ) void FillCharacters( OptionRowDefinition &defOut, CString sParam )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
defOut.m_bOneChoiceForAllPlayers = false; defOut.m_bOneChoiceForAllPlayers = false;
@@ -387,9 +378,6 @@ public:
void FillStyles( OptionRowDefinition &defOut, CString sParam ) void FillStyles( OptionRowDefinition &defOut, CString sParam )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
defOut.m_bOneChoiceForAllPlayers = true; defOut.m_bOneChoiceForAllPlayers = true;
@@ -412,9 +400,6 @@ public:
void FillGroups( OptionRowDefinition &defOut, CString sParam ) void FillGroups( OptionRowDefinition &defOut, CString sParam )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
defOut.m_bOneChoiceForAllPlayers = true; defOut.m_bOneChoiceForAllPlayers = true;
@@ -444,9 +429,6 @@ public:
void FillDifficulties( OptionRowDefinition &defOut, CString sParam ) void FillDifficulties( OptionRowDefinition &defOut, CString sParam )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
defOut.m_bOneChoiceForAllPlayers = true; defOut.m_bOneChoiceForAllPlayers = true;
@@ -474,9 +456,6 @@ public:
void FillSongsInCurrentSongGroup( OptionRowDefinition &defOut, CString sParam ) void FillSongsInCurrentSongGroup( OptionRowDefinition &defOut, CString sParam )
{ {
Init();
defOut.Init();
ASSERT( sParam.size() ); ASSERT( sParam.size() );
vector<Song*> vpSongs; vector<Song*> vpSongs;