From b4102e79c6e4f61b045008511c74c201cad80c0c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 7 Oct 2006 22:42:47 +0000 Subject: [PATCH] phase out separate course difficulty names --- stepmania/Themes/default/metrics.ini | 8 ++++---- stepmania/src/CommonMetrics.cpp | 2 +- stepmania/src/DifficultyMeter.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 26c11fdd06..54c03a5dd3 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -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= diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index e9578b1ca4..f7c1647126 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -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 ); diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index ff3bcdb926..875e3b2085 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -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: