first pass at merging CourseDifficulty into Difficulty

CourseDifficulty names still exist, since it's useful to distinguish them
in command names
This commit is contained in:
Glenn Maynard
2004-06-04 02:05:56 +00:00
parent ffebc3125a
commit b93d1bfd5e
17 changed files with 70 additions and 71 deletions
+5 -3
View File
@@ -43,11 +43,13 @@ Difficulty StringToDifficulty( const CString& sDC )
}
static const CString CourseDifficultyNames[NUM_COURSE_DIFFICULTIES] =
static const CString CourseDifficultyNames[NUM_DIFFICULTIES] =
{
"(not used)",
"Easy",
"Regular",
"Difficult",
"(not used)",
};
XToString( CourseDifficulty );
XToThemedString( CourseDifficulty );
@@ -55,12 +57,12 @@ StringToX( CourseDifficulty );
CourseDifficulty GetNextShownCourseDifficulty( CourseDifficulty cd )
{
for( CourseDifficulty d=(CourseDifficulty)(cd+1); d<NUM_COURSE_DIFFICULTIES; ((int&)d)++ )
for( CourseDifficulty d=(CourseDifficulty)(cd+1); d<NUM_DIFFICULTIES; ((int&)d)++ )
{
if( GAMESTATE->IsCourseDifficultyShown(d) )
return d;
}
return COURSE_DIFFICULTY_INVALID;
return DIFFICULTY_INVALID;
}
/*