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

Start moving ProcessBPMs and ProcessStops next to each other

Browse Source
This commit is contained in:
Devin J. Pohly
2013-05-15 19:57:57 -04:00
parent 6999f94d38
commit 6fadd3a727
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSM.cpp
+5 -5
View File
@@ -738,6 +738,7 @@ bool SMLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache
return false; return false;
} }
vector< pair<float, float> > vBPMChanges, vStops;
out.m_SongTiming.m_sFile = sPath; out.m_SongTiming.m_sFile = sPath;
out.m_sSongFileName = sPath; out.m_sSongFileName = sPath;
@@ -800,16 +801,12 @@ bool SMLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache
} }
else if( sValueName=="BPMS" ) else if( sValueName=="BPMS" )
{ {
vector< pair<float, float> > vBPMChanges;
ParseBPMs(vBPMChanges, sParams[1]); ParseBPMs(vBPMChanges, sParams[1]);
ProcessBPMs(out.m_SongTiming, vBPMChanges);
} }
else if( sValueName=="STOPS" || sValueName=="FREEZES" ) else if( sValueName=="STOPS" || sValueName=="FREEZES" )
{ {
vector< pair<float, float> > vStops;
ParseStops(vStops, sParams[1]); ParseStops(vStops, sParams[1]);
ProcessStops(out.m_SongTiming, vStops);
} }
else if( sValueName=="DELAYS" ) else if( sValueName=="DELAYS" )
@@ -960,8 +957,11 @@ bool SMLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache
LOG->UserLog( "Song file", sPath, "has an unexpected value named \"%s\".", sValueName.c_str() ); LOG->UserLog( "Song file", sPath, "has an unexpected value named \"%s\".", sValueName.c_str() );
} }
// Ensure all warps from negative time changes are in order. // Turn negative time changes into warps
ProcessBPMs(out.m_SongTiming, vBPMChanges);
ProcessStops(out.m_SongTiming, vStops);
out.m_SongTiming.SortSegments( SEGMENT_WARP ); out.m_SongTiming.SortSegments( SEGMENT_WARP );
TidyUpData( out, bFromCache ); TidyUpData( out, bFromCache );
return true; return true;
} }