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

Right, fixed SMA but not SM? (Negative Fixes)

Browse Source
This commit is contained in:
Jason Felds
2011-05-19 21:49:36 -04:00
parent 8cf6286207
commit 719922a187
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSM.cpp
+3 -3
View File
@@ -225,7 +225,7 @@ bool SMLoader::ProcessBPMs( TimingData &out, const RString sParam )
if( negBPM < 0 ) if( negBPM < 0 )
{ {
float endBeat = fBeat + (fNewBPM / -negBPM) * (fBeat - negBeat); float endBeat = fBeat + (fNewBPM / -negBPM) * (fBeat - negBeat);
WarpSegment new_seg(negBeat, endBeat); WarpSegment new_seg(negBeat, endBeat - negBeat);
out.AddWarpSegment( new_seg ); out.AddWarpSegment( new_seg );
negBeat = -1; negBeat = -1;
@@ -241,7 +241,7 @@ bool SMLoader::ProcessBPMs( TimingData &out, const RString sParam )
// add in a warp. // add in a warp.
if( highspeedBeat > 0 ) if( highspeedBeat > 0 )
{ {
WarpSegment new_seg(highspeedBeat, fBeat); WarpSegment new_seg(highspeedBeat, fBeat - highspeedBeat);
out.AddWarpSegment( new_seg ); out.AddWarpSegment( new_seg );
highspeedBeat = -1; highspeedBeat = -1;
} }
@@ -317,7 +317,7 @@ void SMLoader::ProcessStops( TimingData &out, const RString sParam )
float fSecondsPerBeat = 60 / oldBPM.GetBPM(); float fSecondsPerBeat = 60 / oldBPM.GetBPM();
float fSkipBeats = negPause / fSecondsPerBeat; float fSkipBeats = negPause / fSecondsPerBeat;
WarpSegment ws( negBeat, negBeat + fSkipBeats); WarpSegment ws( negBeat, fSkipBeats);
out.AddWarpSegment( ws ); out.AddWarpSegment( ws );
} }
} }
src/Song.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
* @brief The internal version of the cache for StepMania. * @brief The internal version of the cache for StepMania.
* *
* Increment this value to invalidate the current cache. */ * Increment this value to invalidate the current cache. */
const int FILE_CACHE_VERSION = 175; const int FILE_CACHE_VERSION = 176;
/** @brief How long does a song sample last by default? */ /** @brief How long does a song sample last by default? */
const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f; const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;