diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 5e5f01c58f..7f95f5b001 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -172,7 +172,6 @@ PrefsManager::PrefsManager() : m_bInterlaced ( "Interlaced", false ), m_bPAL ( "PAL", false ), m_bDelayedTextureDelete ( "DelayedTextureDelete", true ), - m_bDelayedScreenLoad ( "DelayedScreenLoad", false ), m_bDelayedModelDelete ( "DelayedModelDelete", false ), m_BannerCache ( "BannerCache", BNCACHE_LOW_RES_PRELOAD ), m_bPalettedBannerCache ( "PalettedBannerCache", false ), diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index c8d5f158e9..a8eacf5ff7 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -62,7 +62,6 @@ public: Preference m_bInterlaced; Preference m_bPAL; Preference m_bDelayedTextureDelete; - Preference m_bDelayedScreenLoad; Preference m_bDelayedModelDelete; enum BannerCache { BNCACHE_OFF, diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 7a8ba33ede..57b4503b8e 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -78,7 +78,8 @@ ScreenManager* SCREENMAN = NULL; // global and accessable from anywhere in our program -static Preference g_bConcurrentLoading( "ConcurrentLoading", false ); +static Preference g_bConcurrentLoading( "ConcurrentLoading", false ); +static Preference g_bDelayedScreenLoad( "DelayedScreenLoad", false ); // Screen registration static map *g_pmapRegistrees = NULL; @@ -682,7 +683,7 @@ void ScreenManager::LoadDelayedScreen() * * If DelayedScreenLoad is true, delete them now; this lowers memory requirements, * but results in redundant loads as we unload common data. */ - if( PREFSMAN->m_bDelayedScreenLoad ) + if( g_bDelayedScreenLoad ) DeletePreparedScreens(); else GrabPreparedActors( apActorsToDelete );