From e13cceb830afba1f26f39d06f4754c2b6f65fa20 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 10 Apr 2011 03:31:46 -0400 Subject: [PATCH] [sm130score] Force custom scoring. --- Themes/_fallback/metrics.ini | 4 ++-- Themes/default/metrics.ini | 2 +- src/PrefsManager.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 8bc01987b9..7aefd14793 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2671,8 +2671,8 @@ Line20="conf,VisualDelaySeconds" Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsExtended" PrevScreen="ScreenOptionsExtended" -LineNames="2,3,4,8,11,13,14,15,16,28,29,30" -Line2="conf,ScoringType" +LineNames="3,4,8,11,13,14,15,16,28,29,30" +#Line2="conf,ScoringType" Line3="conf,TimingWindowScale" Line4="conf,LifeDifficulty" Line8="lua,GamePrefDefaultFail()" diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index af1100fcce..50f1d433ec 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1230,7 +1230,7 @@ LineFlashyCombo="lua,UserPrefFlashyCombo()" [ScreenOptionsGraphicsSound] [ScreenOptionsAdvanced] -LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo" +LineNames="3,4,8,11,13,14,15,16,28,29,30,RollCombo" LineRollCombo="lua,UserPrefComboOnRolls()" [ScreenAppearanceOptions] diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp index 3a3a35fa1f..264b0d74ed 100644 --- a/src/PrefsManager.cpp +++ b/src/PrefsManager.cpp @@ -263,7 +263,7 @@ PrefsManager::PrefsManager() : m_CourseSortOrder ( "CourseSortOrder", COURSE_SORT_SONGS ), m_bSubSortByNumSteps ( "SubSortByNumSteps", false ), m_GetRankingName ( "GetRankingName", RANKING_ON ), - m_ScoringType ( "ScoringType", SCORING_NEW ), + m_ScoringType ( "ScoringType", SCORING_CUSTOM ), m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), m_sAdditionalCourseFolders ( "AdditionalCourseFolders", "" ), m_sAdditionalFolders ( "AdditionalFolders", "" ),