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

StringToDifficulty->BackwardCompatibleStringToDifficulty. Don't accept song file backward compatible names other places, like in metrics

Browse Source
This commit is contained in:
Chris Danford
2008-11-28 18:08:12 +00:00
parent b2ed76e536
commit e623ca8d3d
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Difficulty.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ LuaFunction( DifficultyDisplayTypeToLocalizedString, DifficultyDisplayTypeToLoca
/* TODO: Format specific hacks should be moved into the file loader for /* 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 * that format. We don't want to carry these hacks forward to file
* formats that don't need them. */ * formats that don't need them. */
Difficulty StringToDifficulty( const RString& sDC ) Difficulty BackwardCompatibleStringToDifficulty( const RString& sDC )
{ {
RString s2 = sDC; RString s2 = sDC;
s2.MakeLower(); s2.MakeLower();
stepmania/src/Difficulty.h
+3
View File
@@ -22,6 +22,8 @@ const RString& DifficultyToString( Difficulty dc );
Difficulty StringToDifficulty( const RString& sDC ); Difficulty StringToDifficulty( const RString& sDC );
LuaDeclareType( Difficulty ); LuaDeclareType( Difficulty );
Difficulty BackwardCompatibleStringToDifficulty( const RString& sDC );
typedef Difficulty CourseDifficulty; typedef Difficulty CourseDifficulty;
const int NUM_CourseDifficulty = NUM_Difficulty; const int NUM_CourseDifficulty = NUM_Difficulty;
#define FOREACH_ShownCourseDifficulty( cd ) for( Difficulty cd=GetNextShownCourseDifficulty((CourseDifficulty)-1); cd!=Difficulty_Invalid; cd=GetNextShownCourseDifficulty(cd) ) #define FOREACH_ShownCourseDifficulty( cd ) for( Difficulty cd=GetNextShownCourseDifficulty((CourseDifficulty)-1); cd!=Difficulty_Invalid; cd=GetNextShownCourseDifficulty(cd) )
@@ -31,6 +33,7 @@ const RString& CourseDifficultyToLocalizedString( Difficulty dc );
Difficulty GetNextShownCourseDifficulty( Difficulty pn ); Difficulty GetNextShownCourseDifficulty( Difficulty pn );
enum DifficultyDisplayType // ID for coloring and localized strings in StepsDisplay enum DifficultyDisplayType // ID for coloring and localized strings in StepsDisplay
{ {
DifficultyDisplayType_Single_Beginner, DifficultyDisplayType_Single_Beginner,
stepmania/src/NotesLoaderDWI.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ static bool LoadFromDWITokens(
int iNumFeet = atoi(sNumFeet); int iNumFeet = atoi(sNumFeet);
// out.SetDescription(sDescription); // Don't put garbage in the description. // out.SetDescription(sDescription); // Don't put garbage in the description.
out.SetMeter(iNumFeet); out.SetMeter(iNumFeet);
out.SetDifficulty( StringToDifficulty(sDescription) ); out.SetDifficulty( BackwardCompatibleStringToDifficulty(sDescription) );
NoteData newNoteData; NoteData newNoteData;
newNoteData.SetNumTracks( g_mapDanceNoteToNoteDataColumn.size() ); newNoteData.SetNumTracks( g_mapDanceNoteToNoteDataColumn.size() );
stepmania/src/NotesLoaderSM.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ static void LoadFromSMTokens(
out.m_StepsType = GameManager::StringToStepsType( sStepsType ); out.m_StepsType = GameManager::StringToStepsType( sStepsType );
out.SetDescription( sDescription ); out.SetDescription( sDescription );
out.SetDifficulty( StringToDifficulty(sDifficulty) ); out.SetDifficulty( BackwardCompatibleStringToDifficulty(sDifficulty) );
// HACK: We used to store SMANIAC as Difficulty_Hard with special description. // HACK: We used to store SMANIAC as Difficulty_Hard with special description.
// Now, it has its own Difficulty_Challenge // Now, it has its own Difficulty_Challenge