From c0d754e20526d81d9f367a93cebffd50148576b8 Mon Sep 17 00:00:00 2001 From: MinaciousGrace Date: Sat, 10 Jun 2017 05:25:24 -0400 Subject: [PATCH] kill more useless preferences --- src/MusicWheel.cpp | 11 ----------- src/Player.cpp | 1 - src/ProfileManager.cpp | 2 -- src/ProfileManager.h | 4 ---- 4 files changed, 18 deletions(-) diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 2e13ca6539..9bf6a0fb85 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -23,9 +23,6 @@ #include "FilterManager.h" #include "RageString.h" -static Preference g_bMoveRandomToEnd( "MoveRandomToEnd", false ); -static Preference g_bPrecacheAllSorts( "PreCacheAllWheelSorts", false); - #define NUM_WHEEL_ITEMS (static_cast(ceil(NUM_WHEEL_ITEMS_TO_DRAW+2))) #define WHEEL_TEXT(s) THEME->GetString( "MusicWheel", ssprintf("%sText",s.c_str()) ); #define CUSTOM_ITEM_WHEEL_TEXT(s) THEME->GetString( "MusicWheel", ssprintf("CustomItem%sText",s.c_str()) ); @@ -111,14 +108,6 @@ void MusicWheel::BeginScreen() m_WheelItemDatasStatus[so]=NEEDREFILTER; } - - if(g_bPrecacheAllSorts) { - readyWheelItemsData(so, false, ""); - times += ssprintf( "%i:%.3f ", so, timer.GetDeltaTime() ); - } - } - if(g_bPrecacheAllSorts) { - LOG->Trace( "MusicWheel sorting took: %s", times.c_str() ); } // Set m_LastModeMenuItem to the first item that matches the current mode. (Do this diff --git a/src/Player.cpp b/src/Player.cpp index 2d700f2a2e..758a497540 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -138,7 +138,6 @@ static Preference m_fTimingWindowAdd ( "TimingWindowAdd", 0 ); static Preference1D m_fTimingWindowSeconds( TimingWindowSecondsInit, NUM_TimingWindow ); static Preference m_fTimingWindowJump ( "TimingWindowJump", 0.25 ); static Preference m_fMaxInputLatencySeconds ( "MaxInputLatencySeconds", 0.0 ); -static Preference g_bEnableAttackSoundPlayback ( "EnableAttackSounds", true ); static Preference g_bEnableMineSoundPlayback ( "EnableMineHitSound", true ); /** @brief How much life is in a hold note when you start on it? */ diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp index cff62490be..2cef2858ee 100644 --- a/src/ProfileManager.cpp +++ b/src/ProfileManager.cpp @@ -37,7 +37,6 @@ static void DefaultLocalProfileIDInit( size_t /*PlayerNumber*/ i, RString &sName defaultValueOut = ""; } -Preference ProfileManager::m_bProfileStepEdits( "ProfileStepEdits", true ); Preference1D ProfileManager::m_sDefaultLocalProfileID( DefaultLocalProfileIDInit, NUM_PLAYERS ); const RString USER_PROFILES_DIR = "/Save/LocalProfiles/"; @@ -360,7 +359,6 @@ void ProfileManager::RefreshLocalProfilesFromDisk(LoadingWindow* ld) add_category_to_global_list(categorized_profiles[ProfileType_Test]); FOREACH(DirAndProfile, g_vLocalProfile, curr) { - currentlyloadingprofile = curr->sDir.substr(1); curr->profile.LoadAllFromDir(curr->sDir, PREFSMAN->m_bSignProfileData, ld); } } diff --git a/src/ProfileManager.h b/src/ProfileManager.h index 29bd0c0e2e..c5bba69257 100644 --- a/src/ProfileManager.h +++ b/src/ProfileManager.h @@ -88,11 +88,7 @@ class ProfileManager // Lua void PushSelf( lua_State *L ); - static Preference m_bProfileStepEdits; - static Preference m_bProfileCourseEdits; static Preference1D m_sDefaultLocalProfileID; - RString currentlyloadingprofile; - private: ProfileLoadResult LoadProfile( PlayerNumber pn, const RString &sProfileDir);