Fix loading of steps from .sm files.

Some files were using non standard difficulty names
that weren't being caught properly.
This commit is contained in:
Jason Felds
2011-09-23 22:06:43 -04:00
parent 3bd53a5cb4
commit 83c3899c00
3 changed files with 6 additions and 3 deletions
+2
View File
@@ -11,6 +11,8 @@ StepMania 5.0 $next | 2011????
2011/09/23
----------
* [ScreenEvaluation] Added RollingNumbersMaxComboClass metric. [AJ]
* [NotesLoaderSM] Fix loading .sm files with non standard difficulty names.
It should be Hard, not Heavy. [Wolfman2000]
2011/09/22
----------
+3 -2
View File
@@ -88,7 +88,7 @@ void SMLoader::LoadFromTokens(
out.SetDescription( sDescription );
out.SetCredit( sDescription ); // this is often used for both.
out.SetChartName(sDescription); // yeah, one more for good measure.
out.SetDifficulty( StringToDifficulty(sDifficulty) );
out.SetDifficulty( OldStyleStringToDifficulty(sDifficulty) );
// Handle hacks that originated back when StepMania didn't have
// Difficulty_Challenge. (At least v1.64, possibly v3.0 final...)
@@ -669,7 +669,8 @@ bool SMLoader::LoadNoteDataFromSimfile( const RString &path, Steps &out )
if(!(out.m_StepsType == GAMEMAN->StringToStepsType( stepsType ) &&
out.GetDescription() == description &&
out.GetDifficulty() == StringToDifficulty(difficulty)))
(out.GetDifficulty() == StringToDifficulty(difficulty) ||
out.GetDifficulty() == OldStyleStringToDifficulty(difficulty))))
{
continue;
}
+1 -1
View File
@@ -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 = 205;
const int FILE_CACHE_VERSION = 206;
/** @brief How long does a song sample last by default? */
const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;