diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 85c200d3d9..b742f74324 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -424,15 +424,6 @@ PrefsManager::PrefsManager() : m_bLogCheckpoints ( "LogCheckpoints", false ), m_bShowLoadingWindow ( "ShowLoadingWindow", true ) -#if defined(XBOX) - , - m_bEnableVirtualMemory ( "EnableVirtualMemory", true ), - m_iPageFileSize ( "PageFileSize", 384 ), - m_iPageSize ( "PageSize", 16 ), - m_iPageThreshold ( "PageThreshold", 8 ), - m_bLogVirtualMemory ( "LogVirtualMemory", false ) -#endif - #if !defined(WITHOUT_NETWORKING) , m_bEnableScoreboard ( "EnableScoreboard", true ) diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 9914a8d4ce..8d783a101f 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -250,15 +250,6 @@ public: Preference m_bLogCheckpoints; Preference m_bShowLoadingWindow; -#if defined(XBOX) - // Virtual memory preferences - Preference m_bEnableVirtualMemory; - Preference m_iPageFileSize; // page file size in megabytes - Preference m_iPageSize; // page size in kilobytes - Preference m_iPageThreshold; // threshold in kilobytes where virtual memory will be used - Preference m_bLogVirtualMemory; // (under debug) log the virtual memory allocation, etc. -#endif - #if !defined(WITHOUT_NETWORKING) Preference m_bEnableScoreboard; //Alows disabling of scoreboard in network play #endif diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 06bb9d6931..939d9e4d2e 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -978,15 +978,7 @@ int main(int argc, char* argv[]) ApplyLogPreferences(); #if defined(XBOX) - if(PREFSMAN->m_bEnableVirtualMemory) - { - if(!vmem_Manager.Init(1024 * 1024 * PREFSMAN->m_iPageFileSize, 1024 * PREFSMAN->m_iPageSize, 1024 * PREFSMAN->m_iPageThreshold)) - return; - } - - /* Logging the virtual memory manager seems to crash on exit, so it should be enabled only - * for debugging. */ - vmem_Manager.SetLogging(PREFSMAN->m_bLogVirtualMemory); + vmem_Manager.Init(); #endif WriteLogHeader();