[splittiming] replace new Steps with [song].CreateSteps() (224 build errors)
This commit is contained in:
@@ -1031,7 +1031,7 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
|
||||
// Create a Steps for each.
|
||||
vector<Steps*> apSteps;
|
||||
for( unsigned i=0; i<arrayBMSFileNames.size(); i++ )
|
||||
apSteps.push_back( new Steps );
|
||||
apSteps.push_back( out.CreateSteps() );
|
||||
|
||||
// Now, with our fancy little substring, trim the titles and
|
||||
// figure out where each goes.
|
||||
|
||||
@@ -582,7 +582,7 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
|
||||
0==stricmp(sValueName,"COUPLE") ||
|
||||
0==stricmp(sValueName,"SOLO") )
|
||||
{
|
||||
Steps* pNewNotes = new Steps;
|
||||
Steps* pNewNotes = out.CreateSteps();
|
||||
LoadFromDWITokens(
|
||||
sParams[0],
|
||||
sParams[1],
|
||||
|
||||
@@ -877,7 +877,7 @@ skip_track:
|
||||
}
|
||||
}
|
||||
|
||||
Steps *pSteps = new Steps;
|
||||
Steps *pSteps = songOut.CreateSteps();
|
||||
pSteps->m_StepsType = StepsType_guitar_five;
|
||||
pSteps->SetDifficulty( (Difficulty)(gd+1) );
|
||||
pSteps->SetNoteData( noteData );
|
||||
|
||||
@@ -843,7 +843,7 @@ bool PMSLoader::LoadFromDir( const RString &sDir, Song &out )
|
||||
/* Create a Steps for each. */
|
||||
vector<Steps*> apSteps;
|
||||
for( unsigned i=0; i<arrayPMSFileNames.size(); i++ )
|
||||
apSteps.push_back( new Steps );
|
||||
apSteps.push_back( out.CreateSteps() );
|
||||
|
||||
// Now, with our fancy little substring, trim the titles and
|
||||
// figure out where each goes.
|
||||
|
||||
@@ -712,7 +712,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
|
||||
continue;
|
||||
}
|
||||
|
||||
Steps* pNewNotes = new Steps;
|
||||
Steps* pNewNotes = out.CreateSteps();
|
||||
LoadFromSMTokens(
|
||||
sParams[1],
|
||||
sParams[2],
|
||||
@@ -846,7 +846,7 @@ bool SMLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath
|
||||
if( !bAddStepsToSong )
|
||||
return true;
|
||||
|
||||
Steps* pNewNotes = new Steps;
|
||||
Steps* pNewNotes = pSong->CreateSteps();
|
||||
LoadFromSMTokens(
|
||||
sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6],
|
||||
*pNewNotes);
|
||||
|
||||
@@ -360,7 +360,7 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out )
|
||||
continue;
|
||||
}
|
||||
|
||||
Steps* pNewNotes = new Steps;
|
||||
Steps* pNewNotes = out.CreateSteps();
|
||||
LoadFromSMATokens(
|
||||
sParams[1],
|
||||
sParams[2],
|
||||
@@ -702,7 +702,7 @@ bool SMALoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
|
||||
if( !bAddStepsToSong )
|
||||
return true;
|
||||
|
||||
Steps* pNewNotes = new Steps;
|
||||
Steps* pNewNotes = pSong->CreateSteps();
|
||||
LoadFromSMATokens(
|
||||
sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6],
|
||||
*pNewNotes);
|
||||
|
||||
@@ -686,7 +686,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
|
||||
else if( sValueName=="NOTEDATA" )
|
||||
{
|
||||
state = GETTING_STEP_INFO;
|
||||
pNewNotes = new Steps;
|
||||
pNewNotes = out.CreateSteps();
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -957,7 +957,7 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
|
||||
|
||||
else if( sValueName=="NOTEDATA" )
|
||||
{
|
||||
pNewNotes = new Steps;
|
||||
pNewNotes = pSong->CreateSteps();
|
||||
bSSCFormat = true;
|
||||
}
|
||||
if( sValueName=="STEPSTYPE" )
|
||||
@@ -1062,7 +1062,7 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
|
||||
}
|
||||
else
|
||||
{
|
||||
pNewNotes = new Steps;
|
||||
pNewNotes = pSong->CreateSteps();
|
||||
SMLoader::LoadFromSMTokens(
|
||||
sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6],
|
||||
*pNewNotes);
|
||||
|
||||
+1
-1
@@ -3953,7 +3953,7 @@ void ScreenEdit::RevertFromDisk()
|
||||
// put a blank Steps in its place. Note that this does not have to be the
|
||||
// work of someone maliciously changing the simfile; it could happen to
|
||||
// someone editing a new stepchart and reverting from disk, for example.
|
||||
pNewSteps = new Steps();
|
||||
pNewSteps = GAMESTATE->m_pCurSong->CreateSteps();
|
||||
pNewSteps->CreateBlank( id.GetStepsType() );
|
||||
pNewSteps->SetDifficulty( id.GetDifficulty() );
|
||||
GAMESTATE->m_pCurSong->AddSteps( pNewSteps );
|
||||
|
||||
Reference in New Issue
Block a user