From 8652d9e3b95f262e16676da1a95f5bc8d1452f05 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 31 Dec 2005 05:07:05 +0000
Subject: [PATCH] LastSeenMemory -> StepMania

---
 stepmania/src/PrefsManager.cpp |  4 ----
 stepmania/src/PrefsManager.h   |  4 ----
 stepmania/src/StepMania.cpp    | 10 +++++++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index d6f0ffef8e..2e8a13ac82 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -287,9 +287,6 @@ PrefsManager::PrefsManager() :
 	m_sAdditionalSongFolders		( "AdditionalSongFolders",		"" ),
 	m_sAdditionalFolders			( "AdditionalFolders",			"" ),
 	m_sLastSeenVideoDriver			( "LastSeenVideoDriver",		"" ),
-#if defined(WIN32)
-	m_iLastSeenMemory				( "LastSeenMemory",				0 ),
-#endif
 	m_sVideoRenderers				( "VideoRenderers",				"" ),	// StepMania.cpp sets these on first run:
 	m_bSmoothLines					( "SmoothLines",				false ),
 	m_fSoundVolume					( "SoundVolume",				1.0f ),
@@ -305,7 +302,6 @@ PrefsManager::PrefsManager() :
 	m_bDebugLights					( "DebugLights",				false ),
 	m_bMonkeyInput					( "MonkeyInput",				false ),
 	m_sMachineName					( "MachineName",				"" ),
-	m_sIgnoredMessageWindows		( "IgnoredMessageWindows",		"" ),
 	m_sCoursesToShowRanking			( "CoursesToShowRanking",		"" ),
 
 	/* Debug: */
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 7fd4641703..3adbaaf2ef 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -212,9 +212,6 @@ public:
 	Preference<CString>	m_sAdditionalFolders;
 
 	Preference<CString>	m_sLastSeenVideoDriver;
-#if defined(WIN32)
-	Preference<int>		m_iLastSeenMemory;
-#endif
 	Preference<CString>	m_sVideoRenderers;		// StepMania.cpp sets these on first run based on the card
 	Preference<bool>	m_bSmoothLines;
 	Preference<float>	m_fSoundVolume;
@@ -230,7 +227,6 @@ public:
 	Preference<bool>	m_bDebugLights;
 	Preference<bool>	m_bMonkeyInput;
 	Preference<CString>	m_sMachineName;
-	Preference<CString>	m_sIgnoredMessageWindows;
 	Preference<CString>	m_sCoursesToShowRanking;
 
 	/* Debug: */
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 3dca67f367..544a92819f 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -298,6 +298,10 @@ void StepMania::ResetGame()
 	PREFSMAN->SavePrefsToDisk();
 }
 
+#if defined(WIN32)
+static Preference<int> g_iLastSeenMemory( "LastSeenMemory", 0 );
+#endif
+
 static void CheckSettings()
 {
 #if defined(WIN32)
@@ -307,11 +311,11 @@ static void CheckSettings()
 
 	const int Memory = mem.dwTotalPhys / (1024*1024);
 
-	if( PREFSMAN->m_iLastSeenMemory == Memory )
+	if( g_iLastSeenMemory == Memory )
 		return;
 	
-	LOG->Trace( "Memory changed from %i to %i; settings changed", PREFSMAN->m_iLastSeenMemory.Get(), Memory );
-	PREFSMAN->m_iLastSeenMemory.Set( Memory );
+	LOG->Trace( "Memory changed from %i to %i; settings changed", g_iLastSeenMemory.Get(), Memory );
+	g_iLastSeenMemory.Set( Memory );
 
 	/* Let's consider 128-meg systems low-memory, and 256-meg systems high-memory.
 	 * Cut off at 192.  This is somewhat conservative; many 128-meg systems can