actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

LastSeenMemory -> StepMania

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-31 05:07:05 +00:00
parent d8eac51039
commit 8652d9e3b9
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/PrefsManager.cpp
-4
View File
@@ -287,9 +287,6 @@ PrefsManager::PrefsManager() :
m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ), m_sAdditionalSongFolders ( "AdditionalSongFolders", "" ),
m_sAdditionalFolders ( "AdditionalFolders", "" ), m_sAdditionalFolders ( "AdditionalFolders", "" ),
m_sLastSeenVideoDriver ( "LastSeenVideoDriver", "" ), m_sLastSeenVideoDriver ( "LastSeenVideoDriver", "" ),
#if defined(WIN32)
m_iLastSeenMemory ( "LastSeenMemory", 0 ),
#endif
m_sVideoRenderers ( "VideoRenderers", "" ), // StepMania.cpp sets these on first run: m_sVideoRenderers ( "VideoRenderers", "" ), // StepMania.cpp sets these on first run:
m_bSmoothLines ( "SmoothLines", false ), m_bSmoothLines ( "SmoothLines", false ),
m_fSoundVolume ( "SoundVolume", 1.0f ), m_fSoundVolume ( "SoundVolume", 1.0f ),
@@ -305,7 +302,6 @@ PrefsManager::PrefsManager() :
m_bDebugLights ( "DebugLights", false ), m_bDebugLights ( "DebugLights", false ),
m_bMonkeyInput ( "MonkeyInput", false ), m_bMonkeyInput ( "MonkeyInput", false ),
m_sMachineName ( "MachineName", "" ), m_sMachineName ( "MachineName", "" ),
m_sIgnoredMessageWindows ( "IgnoredMessageWindows", "" ),
m_sCoursesToShowRanking ( "CoursesToShowRanking", "" ), m_sCoursesToShowRanking ( "CoursesToShowRanking", "" ),
/* Debug: */ /* Debug: */
stepmania/src/PrefsManager.h
-4
View File
@@ -212,9 +212,6 @@ public:
Preference<CString> m_sAdditionalFolders; Preference<CString> m_sAdditionalFolders;
Preference<CString> m_sLastSeenVideoDriver; 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<CString> m_sVideoRenderers; // StepMania.cpp sets these on first run based on the card
Preference<bool> m_bSmoothLines; Preference<bool> m_bSmoothLines;
Preference<float> m_fSoundVolume; Preference<float> m_fSoundVolume;
@@ -230,7 +227,6 @@ public:
Preference<bool> m_bDebugLights; Preference<bool> m_bDebugLights;
Preference<bool> m_bMonkeyInput; Preference<bool> m_bMonkeyInput;
Preference<CString> m_sMachineName; Preference<CString> m_sMachineName;
Preference<CString> m_sIgnoredMessageWindows;
Preference<CString> m_sCoursesToShowRanking; Preference<CString> m_sCoursesToShowRanking;
/* Debug: */ /* Debug: */
stepmania/src/StepMania.cpp
+7 -3
View File
@@ -298,6 +298,10 @@ void StepMania::ResetGame()
PREFSMAN->SavePrefsToDisk(); PREFSMAN->SavePrefsToDisk();
} }
#if defined(WIN32)
static Preference<int> g_iLastSeenMemory( "LastSeenMemory", 0 );
#endif
static void CheckSettings() static void CheckSettings()
{ {
#if defined(WIN32) #if defined(WIN32)
@@ -307,11 +311,11 @@ static void CheckSettings()
const int Memory = mem.dwTotalPhys / (1024*1024); const int Memory = mem.dwTotalPhys / (1024*1024);
if( PREFSMAN->m_iLastSeenMemory == Memory ) if( g_iLastSeenMemory == Memory )
return; return;
LOG->Trace( "Memory changed from %i to %i; settings changed", PREFSMAN->m_iLastSeenMemory.Get(), Memory ); LOG->Trace( "Memory changed from %i to %i; settings changed", g_iLastSeenMemory.Get(), Memory );
PREFSMAN->m_iLastSeenMemory.Set( Memory ); g_iLastSeenMemory.Set( Memory );
/* Let's consider 128-meg systems low-memory, and 256-meg systems high-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 * Cut off at 192. This is somewhat conservative; many 128-meg systems can