From 261df9636ee07419a711e99f33ecb27ce45ab491 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 28 Nov 2008 21:24:17 +0000 Subject: [PATCH] BackwardCompatible -> DwiCompatible for clarity --- stepmania/src/Difficulty.cpp | 3 ++- stepmania/src/Difficulty.h | 2 +- stepmania/src/NotesLoaderDWI.cpp | 2 +- stepmania/src/NotesLoaderSM.cpp | 2 +- stepmania/src/TrailUtil.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Difficulty.cpp b/stepmania/src/Difficulty.cpp index 08cb57c4eb..42208f9890 100644 --- a/stepmania/src/Difficulty.cpp +++ b/stepmania/src/Difficulty.cpp @@ -15,6 +15,7 @@ static const char *DifficultyNames[] = { "Edit", }; XToString( Difficulty ); +StringToX( Difficulty ); LuaXType( Difficulty ); static const char *DifficultyDisplayTypeNames[] = { @@ -42,7 +43,7 @@ LuaFunction( DifficultyDisplayTypeToLocalizedString, DifficultyDisplayTypeToLoca /* TODO: Format specific hacks should be moved into the file loader for * that format. We don't want to carry these hacks forward to file * formats that don't need them. */ -Difficulty BackwardCompatibleStringToDifficulty( const RString& sDC ) +Difficulty DwiCompatibleStringToDifficulty( const RString& sDC ) { RString s2 = sDC; s2.MakeLower(); diff --git a/stepmania/src/Difficulty.h b/stepmania/src/Difficulty.h index 48ca69108b..da9ed65d95 100644 --- a/stepmania/src/Difficulty.h +++ b/stepmania/src/Difficulty.h @@ -22,7 +22,7 @@ const RString& DifficultyToString( Difficulty dc ); Difficulty StringToDifficulty( const RString& sDC ); LuaDeclareType( Difficulty ); -Difficulty BackwardCompatibleStringToDifficulty( const RString& sDC ); +Difficulty DwiCompatibleStringToDifficulty( const RString& sDC ); typedef Difficulty CourseDifficulty; const int NUM_CourseDifficulty = NUM_Difficulty; diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp index 3795301211..fea1d0dcdf 100644 --- a/stepmania/src/NotesLoaderDWI.cpp +++ b/stepmania/src/NotesLoaderDWI.cpp @@ -173,7 +173,7 @@ static bool LoadFromDWITokens( int iNumFeet = atoi(sNumFeet); // out.SetDescription(sDescription); // Don't put garbage in the description. out.SetMeter(iNumFeet); - out.SetDifficulty( BackwardCompatibleStringToDifficulty(sDescription) ); + out.SetDifficulty( DwiCompatibleStringToDifficulty(sDescription) ); NoteData newNoteData; newNoteData.SetNumTracks( g_mapDanceNoteToNoteDataColumn.size() ); diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp index 10045ab29b..6de22b2306 100644 --- a/stepmania/src/NotesLoaderSM.cpp +++ b/stepmania/src/NotesLoaderSM.cpp @@ -34,7 +34,7 @@ static void LoadFromSMTokens( out.m_StepsType = GameManager::StringToStepsType( sStepsType ); out.SetDescription( sDescription ); - out.SetDifficulty( BackwardCompatibleStringToDifficulty(sDifficulty) ); + out.SetDifficulty( DwiCompatibleStringToDifficulty(sDifficulty) ); // HACK: We used to store SMANIAC as Difficulty_Hard with special description. // Now, it has its own Difficulty_Challenge diff --git a/stepmania/src/TrailUtil.cpp b/stepmania/src/TrailUtil.cpp index f99a08e6b4..fc9a2936cf 100644 --- a/stepmania/src/TrailUtil.cpp +++ b/stepmania/src/TrailUtil.cpp @@ -59,7 +59,7 @@ void TrailID::LoadFromNode( const XNode* pNode ) st = GameManager::StringToStepsType( sTemp ); pNode->GetAttrValue( "CourseDifficulty", sTemp ); - cd = BackwardCompatibleStringToDifficulty( sTemp ); + cd = StringToDifficulty( sTemp ); m_Cache.Unset(); }