From 51027a3904a05dbf5a68efb96dadc141e05a5209 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Tue, 28 May 2013 21:45:56 -0400
Subject: [PATCH] Revert "Fix problem when loading from cache"

This reverts commit 7c3a9eb4275fd9978434711e33f287be015915d8.

Also force increment the cache in case others
got the prior commit.
---
 src/NotesLoaderSSC.cpp | 2 --
 src/Song.cpp           | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/NotesLoaderSSC.cpp b/src/NotesLoaderSSC.cpp
index fa61fc6a05..7a03c1efe2 100644
--- a/src/NotesLoaderSSC.cpp
+++ b/src/NotesLoaderSSC.cpp
@@ -566,7 +566,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
 				{
 					// Process timings and convert negative bpms/stops
 					SMLoader::ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
-					vBPMChanges.clear();
 
 					state = GETTING_STEP_INFO;
 					pNewNotes = out.CreateSteps();
@@ -811,7 +810,6 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
 					{
 						bHasOwnTiming = true;
 						SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
-						vBPMChanges.clear();
 					}
 
 					state = GETTING_SONG_INFO;
diff --git a/src/Song.cpp b/src/Song.cpp
index 0473a83804..4a8cc39b8d 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -42,7 +42,7 @@
  * @brief The internal version of the cache for StepMania.
  *
  * 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? */
 const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;