phase out separate course difficulty names

This commit is contained in:
Glenn Maynard
2006-10-07 22:42:47 +00:00
parent a0d37ae44f
commit b4102e79c6
3 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -2246,8 +2246,8 @@ MeterSetChallengeCommand=diffuse,DifficultyColor("Difficulty_Challenge")
MeterSetEditCommand=diffuse,DifficultyColor("Difficulty_Edit")
MeterSetBeginnerCourseCommand=diffuse,DifficultyColor("Difficulty_Beginner")
MeterSetEasyCourseCommand=diffuse,DifficultyColor("Difficulty_Easy")
MeterSetRegularCourseCommand=diffuse,DifficultyColor("Difficulty_Medium")
MeterSetDifficultCourseCommand=diffuse,DifficultyColor("Difficulty_Hard")
MeterSetMediumCourseCommand=diffuse,DifficultyColor("Difficulty_Medium")
MeterSetHardCourseCommand=diffuse,DifficultyColor("Difficulty_Hard")
MeterSetChallengeCourseCommand=diffuse,DifficultyColor("Difficulty_Challenge")
MeterSetEditCourseCommand=diffuse,DifficultyColor("Difficulty_Edit")
@@ -2267,8 +2267,8 @@ MeterSetChallengeCommand=diffuse,DifficultyColor("Difficulty_Challenge")
MeterSetEditCommand=diffuse,DifficultyColor("Difficulty_Edit")
MeterSetBeginnerCourseCommand=diffuse,DifficultyColor("Difficulty_Beginner")
MeterSetEasyCourseCommand=diffuse,DifficultyColor("Difficulty_Easy")
MeterSetRegularCourseCommand=diffuse,DifficultyColor("Difficulty_Medium")
MeterSetDifficultCourseCommand=diffuse,DifficultyColor("Difficulty_Hard")
MeterSetMediumCourseCommand=diffuse,DifficultyColor("Difficulty_Medium")
MeterSetHardCourseCommand=diffuse,DifficultyColor("Difficulty_Hard")
MeterSetChallengeCourseCommand=diffuse,DifficultyColor("Difficulty_Challenge")
MeterSetEditCourseCommand=diffuse,DifficultyColor("Difficulty_Edit")
ZeroMeterString=
+1 -1
View File
@@ -75,7 +75,7 @@ void ThemeMetricCourseDifficultiesToShow::Read()
FOREACH_CONST( RString, v, i )
{
CourseDifficulty d = StringToCourseDifficulty( *i );
CourseDifficulty d = StringToDifficulty( *i );
if( d == Difficulty_Invalid )
RageException::Throw( "Unknown CourseDifficulty \"%s\" in CourseDifficultiesToShow.", i->c_str() );
m_v.push_back( d );
+1 -1
View File
@@ -20,7 +20,7 @@ DifficultyMeter::DifficultyMeter()
}
static RString GetDifficultyCommandName( Difficulty d ) { return "Set"+DifficultyToString(d); }
static RString GetCourseDifficultyCommandName( CourseDifficulty d ) { return "Set"+CourseDifficultyToString(d)+"Course"; }
static RString GetCourseDifficultyCommandName( CourseDifficulty d ) { return "Set"+DifficultyToString(d)+"Course"; }
static const RString DIFFICULTY_COMMAND_NAME_NONE = "SetNone";
/* sID experiment: