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

Fix timing loading in SSC files

Browse Source 
ProcessBPMsAndStops was always making the timing nonempty, which confused
StepMania into thinking every chart had steps timing.  Now we only call this
function on SSC files (1) for song timing, and (2) if the steps have at least
one BPM specified.
This commit is contained in:
Devin J. Pohly
2013-05-20 22:17:50 -07:00
parent 6a57148833
commit f6c1bd8084
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSSC.cpp
+10 -3
View File
@@ -654,8 +654,10 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
{
// Process timings and convert negative bpms/stops
if( !vBPMChanges.empty() )
{
bHasOwnTiming = true;
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
}
state = GETTING_SONG_INFO;
if( bHasOwnTiming )
@@ -805,8 +807,10 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
{
// Process timings and convert negative bpms/stops
if( !vBPMChanges.empty() )
{
bHasOwnTiming = true;
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
}
state = GETTING_SONG_INFO;
if( bHasOwnTiming )
@@ -1044,7 +1048,10 @@ bool SSCLoader::LoadEditFromMsd(const MsdFile &msd,
return true;
// Process timings and convert negative bpms/stops
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
if( !vBPMChanges.empty() )
{
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
}
if( bSSCFormat )
{