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

merge

Browse Source
This commit is contained in:
Devin J. Pohly
2013-05-28 21:49:51 -04:00
parent f94d3affc2 51027a3904
commit 4758a8727f
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSSC.cpp
-2
View File
@@ -566,7 +566,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
{ {
// Process timings and convert negative bpms/stops // Process timings and convert negative bpms/stops
SMLoader::ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops); SMLoader::ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
vBPMChanges.clear();
state = GETTING_STEP_INFO; state = GETTING_STEP_INFO;
pNewNotes = out.CreateSteps(); pNewNotes = out.CreateSteps();
@@ -811,7 +810,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
{ {
bHasOwnTiming = true; bHasOwnTiming = true;
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops); SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
vBPMChanges.clear();
} }
state = GETTING_SONG_INFO; state = GETTING_SONG_INFO;
src/Song.cpp
+1 -1
View File
@@ -42,7 +42,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 = 211; const int FILE_CACHE_VERSION = 212;
/** @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;