From 11de86e2601b2c52e568433e1d822a3c795bb0e0 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 15 May 2011 16:40:06 -0400 Subject: [PATCH] [splittiming] Right, LOAD the #SPEEDS. --- src/NotesLoaderSMA.cpp | 4 +++- src/NotesLoaderSSC.cpp | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index 6963b98ac9..6acec86ced 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -667,7 +667,9 @@ bool SMALoader::LoadFromSMAFile( const RString &sPath, Song &out ) else if( sValueName=="SPEED" ) { - ; // This is something we should consider implementing. + TimingData &timing = (state == SMA_GETTING_STEP_INFO + ? pNewNotes->m_Timing : out.m_SongTiming); + ProcessSpeeds( timing, iRowsPerBeat, sParams[1] ); } else if( sValueName=="MULTIPLIER" ) diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp index 116f4c1d98..68a2886042 100644 --- a/src/NotesLoaderSSC.cpp +++ b/src/NotesLoaderSSC.cpp @@ -558,6 +558,11 @@ bool SSCLoader::LoadFromSSCFile( const RString &sPath, Song &out, bool bFromCach ProcessWarps(stepsTiming, sParams[1]); } + else if( sValueName=="SPEED" ) + { + ProcessSpeeds( stepsTiming, sParams[1] ); + } + else if( sValueName=="LABELS" ) { ProcessLabels(stepsTiming, sParams[1]);