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

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesWriterJson.cpp
+3 -5
View File
@@ -79,8 +79,6 @@ static void Serialize( const NoteData &o, Json::Value &root )
{
NoteData::TrackMap::const_iterator begin, end;
o.GetTapNoteRange( t, 0, MAX_NOTE_ROW, begin, end );
//NoteData::TrackMap tm = o.GetTrack(t);
//FOREACHM_CONST( int, TapNote, tm, iter )
for( ; begin != end; ++begin )
{
int iRow = begin->first;
@@ -185,11 +183,11 @@ bool NotesWriterJson::WriteSong( const RString &sFile, const Song &out, bool bWr
if( bWriteSteps )
{
vector<const Steps*> vpSteps;
FOREACH_CONST( Steps*, out.GetAllSteps(), iter )
for (Steps * iter : out.GetAllSteps())
{
if( (*iter)->IsAutogen() )
if( iter->IsAutogen() )
continue;
vpSteps.push_back( *iter );
vpSteps.push_back( iter );
}
JsonUtil::SerializeVectorPointers<Steps>( vpSteps, Serialize, root["Charts"] );
}