diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp index 264b0d74ed..87ec4d8b7f 100644 --- a/src/PrefsManager.cpp +++ b/src/PrefsManager.cpp @@ -125,15 +125,6 @@ XToString( CourseSortOrders ); StringToX( CourseSortOrders ); LuaXType( CourseSortOrders ); -static const char *ScoringTypeNames[] = { - "New", - "Old", - "Custom", -}; -XToString( ScoringType ); -StringToX( ScoringType ); -LuaXType( ScoringType ); - // XXX: Fix fail bug? /* static const char *DefaultFailTypeNames[] = { "Immediate", @@ -263,7 +254,6 @@ PrefsManager::PrefsManager() : m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), m_GetRankingName ( "GetRankingName", RANKING_ON ), - m_ScoringType ( "ScoringType", SCORING_CUSTOM ), m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), m_sAdditionalCourseFolders ( "AdditionalCourseFolders", "" ), m_sAdditionalFolders ( "AdditionalFolders", "" ), diff --git a/src/PrefsManager.h b/src/PrefsManager.h index 332da7da08..2d1f564bb3 100644 --- a/src/PrefsManager.h +++ b/src/PrefsManager.h @@ -108,14 +108,6 @@ enum CourseSortOrders NUM_CourseSortOrders, CourseSortOrders_Invalid }; -enum ScoringType -{ - SCORING_NEW, - SCORING_OLD, - SCORING_CUSTOM, - NUM_ScoringType, - ScoringType_Invalid -}; enum DefaultFailType { @@ -266,8 +258,6 @@ public: Preference m_bSubSortByNumSteps; Preference m_GetRankingName; - Preference m_ScoringType; - Preference m_sAdditionalSongFolders; Preference m_sAdditionalCourseFolders; Preference m_sAdditionalFolders; diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp index 80aa1969aa..5495de6f86 100644 --- a/src/ScreenOptionsMasterPrefs.cpp +++ b/src/ScreenOptionsMasterPrefs.cpp @@ -718,7 +718,6 @@ static void InitializeConfOptions() g_ConfOptions.back().m_sPrefName = "SongsPerPlay"; ADD( ConfOption( "EventMode", MovePref, "Off","On (recommended)" ) ); - ADD( ConfOption( "ScoringType", MovePref, "New","Old","Custom" ) ); ADD( ConfOption( "TimingWindowScale", TimingWindowScale, "|1","|2","|3","|4","|5","|6","|7","|8","Justice" ) ); ADD( ConfOption( "LifeDifficulty", LifeDifficulty, "|1.2","|1.0","|0.8","|0.6","|0.4","|0.33","|0.25" ) ); g_ConfOptions.back().m_sPrefName = "LifeDifficultyScale";