diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index f6405363d2..ea6d820ff6 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -12,7 +12,6 @@ #include "RageUtil_WorkerThread.h" #include "arch/arch.h" #include "arch/MemoryCard/MemoryCardDriver_Null.h" -#include "PrefsManager.h" MemoryCardManager* MEMCARDMAN = NULL; // global and accessable from anywhere in our program @@ -40,6 +39,8 @@ static void MemoryCardUsbLevelInit( size_t /*PlayerNumber*/ i, RString &sNameOut defaultValueOut = -1; } +static Preference g_bMemoryCards( "MemoryCards", true ); + // if set, always use the device that mounts to this point Preference1D MemoryCardManager::m_sMemoryCardOsMountPoint( MemoryCardOsMountPointInit, NUM_PLAYERS ); // Look for this level, bus, port when assigning cards. -1 = match any @@ -136,7 +137,7 @@ ThreadedMemoryCardWorker::ThreadedMemoryCardWorker( bool bInEditScreens ): RageWorkerThread("MemoryCardWorker"), UsbStorageDevicesMutex("UsbStorageDevicesMutex") { - if( PREFSMAN->m_bMemoryCards || bInEditScreens ) + if( g_bMemoryCards || bInEditScreens ) m_pDriver = MakeMemoryCardDriver(); else m_pDriver = new MemoryCardDriver_Null; diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 07fa7d1ae8..e5598b92b0 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -267,7 +267,6 @@ PrefsManager::PrefsManager() : m_sLanguage ( "Language", "" ), // ThemeManager will deal with this invalid language m_sMemoryCardProfileSubdir ( "MemoryCardProfileSubdir", PRODUCT_ID ), m_iProductID ( "ProductID", 1 ), - m_bMemoryCards ( "MemoryCards", true ), m_iCenterImageTranslateX ( "CenterImageTranslateX", 0 ), m_iCenterImageTranslateY ( "CenterImageTranslateY", 0 ), m_fCenterImageAddWidth ( "CenterImageAddWidth", 0 ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 4c28fac601..cd6cbe4b00 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -157,7 +157,6 @@ public: Preference m_sLanguage; Preference m_sMemoryCardProfileSubdir; // the directory on a memory card to look in for a profile Preference m_iProductID; // Saved in HighScore to track what software version a score came from. - Preference m_bMemoryCards; Preference m_iCenterImageTranslateX; Preference m_iCenterImageTranslateY; Preference m_fCenterImageAddWidth;