diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 4e603c09eb..f5b88c0de7 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3497,7 +3497,6 @@ OptionMenuFlags=together;explanations Line1=conf,AutogenSteps Line2=conf,AutogenGroupCourses Line3=conf,FastLoad -Line4=conf,SaveStats [ScreenSoundOptions] Fallback=ScreenOptionsSubmenu @@ -4082,6 +4081,7 @@ NextScreen=ScreenBranchGameplay TimerSeconds=30 StyleIcon=0 MemoryCardIcons=0 +CapitalizeAllOptionNames=1 LineNames=1,2,3,4,5 OptionMenuFlags= diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index c5bbfeeaa0..1ec7255fbf 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -227,12 +227,6 @@ void PrefsManager::Init() g_bAutoRestart = false; m_bSignProfileData = false; - /* Write machine stats takes too long for many people; disable it by default. */ - m_bWriteMachineStatsHtml = false; - - /* Most people use local profiles, so writing profile stats is redundant. */ - m_bWritePlayerStatsHtml = false; - m_bEditorShowBGChangesPlay = false; /* XXX: Set these defaults for individual consoles using VideoCardDefaults.ini. */ @@ -543,8 +537,6 @@ void PrefsManager::ReadPrefsFromFile( CString sIni ) ini.GetValue( "Options", "AnisotropicFiltering", m_bAnisotropicFiltering ); ini.GetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.GetValue( "Options", "SignProfileData", m_bSignProfileData ); - ini.GetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml ); - ini.GetValue( "Options", "WritePlayerStatsHtml", m_bWritePlayerStatsHtml ); ini.GetValue( "Editor", "ShowBGChangesPlay", m_bEditorShowBGChangesPlay ); @@ -776,8 +768,6 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "AnisotropicFiltering", m_bAnisotropicFiltering ); ini.SetValue( "Options", "AutoRestart", g_bAutoRestart ); ini.SetValue( "Options", "SignProfileData", m_bSignProfileData ); - ini.SetValue( "Options", "WriteMachineStatsHtml", m_bWriteMachineStatsHtml ); - ini.SetValue( "Options", "WritePlayerStatsHtml", m_bWritePlayerStatsHtml ); ini.SetValue( "Options", "SoundWriteAhead", m_iSoundWriteAhead ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 6fa7e1c039..15b450927c 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -218,9 +218,6 @@ public: // have the same key, or else the profile's data will be discarded. bool m_bSignProfileData; - bool m_bWriteMachineStatsHtml; - bool m_bWritePlayerStatsHtml; - /* Editor prefs: */ bool m_bEditorShowBGChangesPlay; diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 9f2b175ff9..15ad6eca48 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -701,9 +701,7 @@ bool Profile::SaveAllToDir( CString sDir, bool bSignData ) const } } - if( (IsMachine() && PREFSMAN->m_bWriteMachineStatsHtml) || - (!IsMachine() && PREFSMAN->m_bWritePlayerStatsHtml) ) - SaveStatsWebPageToDir( sDir ); + SaveStatsWebPageToDir( sDir ); // // create edits dir diff --git a/stepmania/src/ScreenDownloadMachineStats.cpp b/stepmania/src/ScreenDownloadMachineStats.cpp index 23072ad6a7..506a7fe4ba 100644 --- a/stepmania/src/ScreenDownloadMachineStats.cpp +++ b/stepmania/src/ScreenDownloadMachineStats.cpp @@ -18,12 +18,9 @@ static void SaveMachineStatsToFirstMemCard() CString sDir = MEM_CARD_MOUNT_POINT[pn]; sDir += "MachineProfile/"; - bool bOldVal = PREFSMAN->m_bWriteMachineStatsHtml; - PREFSMAN->m_bWriteMachineStatsHtml = true; PROFILEMAN->GetMachineProfile()->SaveAllToDir( sDir, PREFSMAN->m_bSignProfileData ); - PREFSMAN->m_bWriteMachineStatsHtml = bOldVal; SCREENMAN->SystemMessage( ssprintf("Machine stats saved to P%d card.",pn+1) ); return; } diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index bdb0e0cba9..02cc2fce2d 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -213,18 +213,6 @@ MOVE( AutogenSteps, PREFSMAN->m_bAutogenSteps ); MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses ); MOVE( FastLoad, PREFSMAN->m_bFastLoad ); -static void SaveStats( int &sel, bool ToSel, const CStringArray &choices ) -{ - if( ToSel ) - { - sel = (PREFSMAN->m_bWriteMachineStatsHtml)? 1:0; - sel |= (PREFSMAN->m_bWritePlayerStatsHtml)? 2:0; - } else { - PREFSMAN->m_bWriteMachineStatsHtml = !!(sel&1); - PREFSMAN->m_bWritePlayerStatsHtml = !!(sel&2); - } -} - /* Background options */ MOVE( BackgroundMode, PREFSMAN->m_BackgroundMode ); MOVE( ShowDanger, PREFSMAN->m_bShowDanger ); @@ -432,7 +420,6 @@ static const ConfOption g_ConfOptions[] = ConfOption( "Autogen\nSteps", AutogenSteps, "OFF","ON" ), ConfOption( "Autogen\nGroup Courses", AutogenGroupCourses, "OFF","ON" ), ConfOption( "Fast\nLoad", FastLoad, "OFF","ON" ), - ConfOption( "Save\nStats", SaveStats, "OFF", "MACHINE", "PROFILE", "BOTH" ), /* Background options */ ConfOption( "Background\nMode", BackgroundMode, "OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ),