From da275bc880bcf93f78e2804feea6a9637f8860cc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 4 Jun 2004 03:38:52 +0000 Subject: [PATCH] fix inconsistent course difficulty strings --- stepmania/src/DifficultyMeter.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index 4fb2172e9f..161e9991e7 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -137,16 +137,7 @@ void DifficultyMeter::SetFromTrail( const Trail* pTrail ) Unset(); return; } -/* - Difficulty FakeDifficulty; - switch( pTrail->m_CourseDifficulty ) - { - case COURSE_DIFFICULTY_EASY: FakeDifficulty = DIFFICULTY_EASY; break; - case COURSE_DIFFICULTY_REGULAR: FakeDifficulty = DIFFICULTY_MEDIUM; break; - case COURSE_DIFFICULTY_DIFFICULT: FakeDifficulty = DIFFICULTY_HARD; break; - default: ASSERT(0); - } -*/ + SetFromMeterAndDifficulty( pTrail->GetMeter(), pTrail->m_CourseDifficulty ); SetDifficulty( CourseDifficultyToString(pTrail->m_CourseDifficulty) + "Course" ); } @@ -166,7 +157,7 @@ void DifficultyMeter::SetFromDifficulty( Difficulty dc ) void DifficultyMeter::SetFromCourseDifficulty( CourseDifficulty cd ) { SetFromMeterAndDifficulty( 0, DIFFICULTY_BEGINNER ); - SetDifficulty( CourseDifficultyToString( cd ) ); + SetDifficulty( CourseDifficultyToString( cd ) + "Course" ); } void DifficultyMeter::SetFromMeterAndDifficulty( int iMeter, Difficulty dc )