New branch: [notesloader]

Time to better unify our files and refactor properly.
2011-06-09 13:46:30 -04:00
parent 0fa0d42549
commit b6bf776716
12 changed files with 53 additions and 42 deletions
@@ -1655,12 +1655,15 @@ void SongManager::LoadStepEditsFromProfileDir( const RString &sProfileDir, Profi
 		for( int i=0; i<size; i++ )
 		{
 			RString fn = vsFiles[i];
-
-			bool bLoadedFromSSC = SSCLoader::LoadEditFromFile( fn, slot, true );
+			SSCLoader loaderSSC;
+			bool bLoadedFromSSC = loaderSSC.LoadEditFromFile( fn, slot, true );
 			// If we don't load the edit from a .ssc-style .edit, then we should
 			// also try the .sm-style edit file. -aj
 			if( !bLoadedFromSSC )
-				SMLoader::LoadEditFromFile( fn, slot, true );
+			{
+				SMLoader loaderSM;
+				loaderSM.LoadEditFromFile( fn, slot, true );
+			}
 		}
 	}
 }