From a8f22ef178a959ac342b0d25a4cb1d52e39c7c09 Mon Sep 17 00:00:00 2001 From: Mark Cannon Date: Sun, 11 Sep 2011 17:12:09 +0000 Subject: [PATCH] fix undeclared function and typo (seriously, please at least try to compile your code before committing) --- src/CourseLoaderCRS.cpp | 2 +- src/Difficulty.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CourseLoaderCRS.cpp b/src/CourseLoaderCRS.cpp index 00d4bfb27c..76013b06be 100644 --- a/src/CourseLoaderCRS.cpp +++ b/src/CourseLoaderCRS.cpp @@ -275,7 +275,7 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou new_entry.stepsCriteria.m_difficulty = OldStyleStringToDifficulty( sParams[2] ); //most CRS files use old-style difficulties, but Difficulty enum values can be used in SM5. Test for those too. if( new_entry.stepsCriteria.m_difficulty == Difficulty_Invalid ) - new_entry.stepsCriteria.m_difficulty = StringToDifficulty( sParamsp2] ); + new_entry.stepsCriteria.m_difficulty = StringToDifficulty( sParams[2] ); if( new_entry.stepsCriteria.m_difficulty == Difficulty_Invalid ) { int retval = sscanf( sParams[2], "%d..%d", &new_entry.stepsCriteria.m_iLowMeter, &new_entry.stepsCriteria.m_iHighMeter ); diff --git a/src/Difficulty.h b/src/Difficulty.h index 1bd69dfa4b..2d48263a21 100644 --- a/src/Difficulty.h +++ b/src/Difficulty.h @@ -22,6 +22,8 @@ const RString& DifficultyToString( Difficulty dc ); Difficulty StringToDifficulty( const RString& sDC ); LuaDeclareType( Difficulty ); +Difficulty OldStyleStringToDifficulty( const RString& sDC ); // compatibility + typedef Difficulty CourseDifficulty; const int NUM_CourseDifficulty = NUM_Difficulty; /** @brief Loop through the shown course difficulties. */