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

[splittiming] replace new Steps with [song].CreateSteps() (224 build errors)

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-05-09 22:47:47 +07:00
parent 0d42b00621
commit 31848e79c4
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderBMS.cpp
+1 -1
View File
@@ -1031,7 +1031,7 @@ bool BMSLoader::LoadFromDir( const RString &sDir, Song &out )
// Create a Steps for each. // Create a Steps for each.
vector<Steps*> apSteps; vector<Steps*> apSteps;
for( unsigned i=0; i<arrayBMSFileNames.size(); i++ ) 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 // Now, with our fancy little substring, trim the titles and
// figure out where each goes. // figure out where each goes.
src/NotesLoaderDWI.cpp
+1 -1
View File
@@ -582,7 +582,7 @@ bool DWILoader::LoadFromDir( const RString &sPath_, Song &out, set<RString> &Bla
0==stricmp(sValueName,"COUPLE") || 0==stricmp(sValueName,"COUPLE") ||
0==stricmp(sValueName,"SOLO") ) 0==stricmp(sValueName,"SOLO") )
{ {
Steps* pNewNotes = new Steps; Steps* pNewNotes = out.CreateSteps();
LoadFromDWITokens( LoadFromDWITokens(
sParams[0], sParams[0],
sParams[1], sParams[1],
src/NotesLoaderMidi.cpp
+1 -1
View File
@@ -877,7 +877,7 @@ skip_track:
} }
} }
Steps *pSteps = new Steps; Steps *pSteps = songOut.CreateSteps();
pSteps->m_StepsType = StepsType_guitar_five; pSteps->m_StepsType = StepsType_guitar_five;
pSteps->SetDifficulty( (Difficulty)(gd+1) ); pSteps->SetDifficulty( (Difficulty)(gd+1) );
pSteps->SetNoteData( noteData ); pSteps->SetNoteData( noteData );
src/NotesLoaderPMS.cpp
+1 -1
View File
@@ -843,7 +843,7 @@ bool PMSLoader::LoadFromDir( const RString &sDir, Song &out )
/* Create a Steps for each. */ /* Create a Steps for each. */
vector<Steps*> apSteps; vector<Steps*> apSteps;
for( unsigned i=0; i<arrayPMSFileNames.size(); i++ ) 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 // Now, with our fancy little substring, trim the titles and
// figure out where each goes. // figure out where each goes.
src/NotesLoaderSM.cpp
+2 -2
View File
@@ -712,7 +712,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
continue; continue;
} }
Steps* pNewNotes = new Steps; Steps* pNewNotes = out.CreateSteps();
LoadFromSMTokens( LoadFromSMTokens(
sParams[1], sParams[1],
sParams[2], sParams[2],
@@ -846,7 +846,7 @@ bool SMLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePath
if( !bAddStepsToSong ) if( !bAddStepsToSong )
return true; return true;
Steps* pNewNotes = new Steps; Steps* pNewNotes = pSong->CreateSteps();
LoadFromSMTokens( LoadFromSMTokens(
sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6], sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6],
*pNewNotes); *pNewNotes);
src/NotesLoaderSMA.cpp
+2 -2
View File
@@ -360,7 +360,7 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out )
continue; continue;
} }
Steps* pNewNotes = new Steps; Steps* pNewNotes = out.CreateSteps();
LoadFromSMATokens( LoadFromSMATokens(
sParams[1], sParams[1],
sParams[2], sParams[2],
@@ -702,7 +702,7 @@ bool SMALoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
if( !bAddStepsToSong ) if( !bAddStepsToSong )
return true; return true;
Steps* pNewNotes = new Steps; Steps* pNewNotes = pSong->CreateSteps();
LoadFromSMATokens( LoadFromSMATokens(
sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6], sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6],
*pNewNotes); *pNewNotes);
src/NotesLoaderSSC.cpp
+3 -3
View File
@@ -686,7 +686,7 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach
else if( sValueName=="NOTEDATA" ) else if( sValueName=="NOTEDATA" )
{ {
state = GETTING_STEP_INFO; state = GETTING_STEP_INFO;
pNewNotes = new Steps; pNewNotes = out.CreateSteps();
} }
break; break;
} }
@@ -957,7 +957,7 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
else if( sValueName=="NOTEDATA" ) else if( sValueName=="NOTEDATA" )
{ {
pNewNotes = new Steps; pNewNotes = pSong->CreateSteps();
bSSCFormat = true; bSSCFormat = true;
} }
if( sValueName=="STEPSTYPE" ) if( sValueName=="STEPSTYPE" )
@@ -1062,7 +1062,7 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
} }
else else
{ {
pNewNotes = new Steps; pNewNotes = pSong->CreateSteps();
SMLoader::LoadFromSMTokens( SMLoader::LoadFromSMTokens(
sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6], sParams[1], sParams[2], sParams[3], sParams[4], sParams[5], sParams[6],
*pNewNotes); *pNewNotes);
src/ScreenEdit.cpp
+1 -1
View File
@@ -3953,7 +3953,7 @@ void ScreenEdit::RevertFromDisk()
// put a blank Steps in its place. Note that this does not have to be the // 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 // work of someone maliciously changing the simfile; it could happen to
// someone editing a new stepchart and reverting from disk, for example. // someone editing a new stepchart and reverting from disk, for example.
pNewSteps = new Steps(); pNewSteps = GAMESTATE->m_pCurSong->CreateSteps();
pNewSteps->CreateBlank( id.GetStepsType() ); pNewSteps->CreateBlank( id.GetStepsType() );
pNewSteps->SetDifficulty( id.GetDifficulty() ); pNewSteps->SetDifficulty( id.GetDifficulty() );
GAMESTATE->m_pCurSong->AddSteps( pNewSteps ); GAMESTATE->m_pCurSong->AddSteps( pNewSteps );