diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index cd972de784..e6253c5551 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -712,7 +712,7 @@ void Course::GetCourseInfo( StepsType nt, vector &ci, CourseDiffic cinfo.Random = ( e.type == COURSE_ENTRY_RANDOM || e.type == COURSE_ENTRY_RANDOM_WITHIN_GROUP ); cinfo.Mystery = e.mystery; cinfo.CourseIndex = i; - cinfo.CourseDifficulty = DerefDifficulty(cd); + cinfo.Difficulty = DerefDifficulty(cd); ci.push_back( cinfo ); } @@ -791,7 +791,7 @@ bool Course::IsFixed() const Difficulty Course::GetDifficulty( const Info &stage ) const { Difficulty dc = m_entries[stage.CourseIndex].difficulty; - Difficulty new_dc = Difficulty( dc + stage.CourseDifficulty ); + Difficulty new_dc = Difficulty( dc + stage.Difficulty ); return (new_dc < NUM_DIFFICULTIES) ? new_dc : dc; } @@ -811,7 +811,7 @@ void Course::GetMeterRange( int stage, int& iMeterLowOut, int& iMeterHighOut, Co void Course::GetMeterRange( const Info &stage, int& iMeterLowOut, int& iMeterHighOut ) const { - GetMeterRange( stage.CourseIndex, iMeterLowOut, iMeterHighOut, stage.CourseDifficulty ); + GetMeterRange( stage.CourseIndex, iMeterLowOut, iMeterHighOut, stage.Difficulty ); } bool Course::GetTotalSeconds( float& fSecondsOut ) const diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h index b007cce657..0d84950dbb 100644 --- a/stepmania/src/Course.h +++ b/stepmania/src/Course.h @@ -97,7 +97,7 @@ public: struct Info { - Info(): pSong(NULL), pNotes(NULL), Random(false), CourseDifficulty(COURSE_DIFFICULTY_INVALID) { } + Info(): pSong(NULL), pNotes(NULL), Random(false), Difficulty(COURSE_DIFFICULTY_INVALID) { } void GetAttackArray( AttackArray &out ) const; Song* pSong; @@ -106,7 +106,7 @@ public: AttackArray Attacks; bool Random; bool Mystery; - CourseDifficulty CourseDifficulty; + CourseDifficulty Difficulty; /* Corresponding entry in m_entries: */ int CourseIndex; };