From 526584d11e1606f7c61cb2351a2723f62b7003b1 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 19 May 2011 12:19:30 -0400 Subject: [PATCH] Figures I missed warp conversions on SMA. Okay, I may have to start moving these functions into the SM Loader at this rate. --- src/NotesLoaderSMA.cpp | 8 ++++---- src/Song.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NotesLoaderSMA.cpp b/src/NotesLoaderSMA.cpp index 8caba0a62b..fc67e3b598 100644 --- a/src/NotesLoaderSMA.cpp +++ b/src/NotesLoaderSMA.cpp @@ -92,7 +92,7 @@ bool SMALoader::ProcessBPMs( TimingData &out, const int iRowsPerBeat, const RStr if( negBPM < 0 ) { float endBeat = fBeat + (fNewBPM / -negBPM) * (fBeat - negBeat); - WarpSegment new_seg(negBeat, endBeat); + WarpSegment new_seg(negBeat, endBeat - negBeat); out.AddWarpSegment( new_seg ); negBeat = -1; @@ -108,7 +108,7 @@ bool SMALoader::ProcessBPMs( TimingData &out, const int iRowsPerBeat, const RStr // add in a warp. if( highspeedBeat > 0 ) { - WarpSegment new_seg(highspeedBeat, fBeat); + WarpSegment new_seg(highspeedBeat, fBeat - highspeedBeat); out.AddWarpSegment( new_seg ); highspeedBeat = -1; } @@ -157,7 +157,7 @@ void SMALoader::ProcessStops( TimingData &out, const int iRowsPerBeat, const RSt if( negBeat + fSkipBeats > fFreezeBeat ) fSkipBeats = fFreezeBeat - negBeat; - WarpSegment ws( negBeat, negBeat + fSkipBeats); + WarpSegment ws( negBeat, fSkipBeats); out.AddWarpSegment( ws ); negBeat = -1; @@ -184,7 +184,7 @@ void SMALoader::ProcessStops( TimingData &out, const int iRowsPerBeat, const RSt float fSecondsPerBeat = 60 / oldBPM.GetBPM(); float fSkipBeats = negPause / fSecondsPerBeat; - WarpSegment ws( negBeat, negBeat + fSkipBeats); + WarpSegment ws( negBeat, fSkipBeats); out.AddWarpSegment( ws ); } } diff --git a/src/Song.cpp b/src/Song.cpp index cca7a65b38..31693eef0e 100644 --- a/src/Song.cpp +++ b/src/Song.cpp @@ -41,7 +41,7 @@ * @brief The internal version of the cache for StepMania. * * Increment this value to invalidate the current cache. */ -const int FILE_CACHE_VERSION = 174; +const int FILE_CACHE_VERSION = 175; /** @brief How long does a song sample last by default? */ const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;