Sort steps by type and difficulty first before saving to cache and dw…

…i/sm files
sillybear · Jul 25, 2017 · 852f27c · 852f27c
1 parent 23495bd
commit 852f27c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/NotesWriterDWI.cpp b/src/NotesWriterDWI.cpp
@@ -7,6 +7,7 @@
 #include "RageFile.h"
 #include "NoteDataUtil.h"
 #include "RageFile.h"
+#include "StepsUtil.h"
 
 static void write_tag( RageFile& f, CString const &format, CString const &value)
 {
@@ -415,7 +416,9 @@ bool NotesWriterDWI::Write( CString sPath, const Song &out )
 		write_tag( f, "#FREEZE:%s;", join(",", stopLines) );
 	}
 
-	const vector<Steps*>& vpSteps = out.GetAllSteps();
+	vector<Steps*> vpSteps = out.GetAllSteps();
+	StepsUtil::SortStepsByTypeAndDifficulty( vpSteps );
+
 	for( unsigned i=0; i<vpSteps.size(); i++ ) 
 	{
 		const Steps* pSteps = vpSteps[i];

diff --git a/src/NotesWriterSM.cpp b/src/NotesWriterSM.cpp
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "NotesWriterSM.h"
+#include "StepsUtil.h"
 #include "Steps.h"
 #include "RageUtil.h"
 #include "GameManager.h"
@@ -284,7 +285,9 @@ bool NotesWriterSM::Write(CString sPath, const Song &out, bool bSavingCache )
 	//
 	// Save all Steps for this file
 	//
-	const vector<Steps*>& vpSteps = out.GetAllSteps();
+	vector<Steps*> vpSteps = out.GetAllSteps();
+	StepsUtil::SortStepsByTypeAndDifficulty( vpSteps );
+
 	for( i=0; i<vpSteps.size(); i++ ) 
 	{
 		const Steps* pSteps = vpSteps[i];