From 5c64b361b7b7506e768216a341eca69738f1cccd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 31 Dec 2003 09:32:21 +0000 Subject: [PATCH] m_bCheckSongCacheOnLoad -> !m_bFastLoad --- stepmania/src/PrefsManager.cpp | 6 +++--- stepmania/src/PrefsManager.h | 2 +- stepmania/src/ScreenOptionsMasterPrefs.cpp | 4 ++-- stepmania/src/Song.cpp | 6 +++--- stepmania/src/SongManager.cpp | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 6a8d403087..a535df73d0 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -95,7 +95,7 @@ PrefsManager::PrefsManager() m_bTexturePreload = false; m_bDelayedScreenLoad = false; m_BannerCache = BNCACHE_LOW_RES; - m_bCheckSongCacheOnLoad = true; + m_bFastLoad = false; m_MusicWheelUsesSections = ALWAYS; m_iMusicWheelSwitchSpeed = 10; m_bEasterEggs = true; @@ -299,7 +299,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk() ini.GetValue( "Options", "TexturePreload", m_bTexturePreload ); ini.GetValue( "Options", "DelayedScreenLoad", m_bDelayedScreenLoad ); ini.GetValue( "Options", "BannerCache", (int&)m_BannerCache ); - ini.GetValue( "Options", "CheckSongCacheOnLoad", m_bCheckSongCacheOnLoad ); + ini.GetValue( "Options", "FastLoad", m_bFastLoad ); ini.GetValue( "Options", "MusicWheelUsesSections", (int&)m_MusicWheelUsesSections ); ini.GetValue( "Options", "MusicWheelSwitchSpeed", m_iMusicWheelSwitchSpeed ); ini.GetValue( "Options", "SoundDrivers", m_sSoundDrivers ); @@ -465,7 +465,7 @@ void PrefsManager::SaveGlobalPrefsToDisk() const ini.SetValue( "Options", "TexturePreload", m_bTexturePreload ); ini.SetValue( "Options", "DelayedScreenLoad", m_bDelayedScreenLoad ); ini.SetValue( "Options", "BannerCache", m_BannerCache ); - ini.SetValue( "Options", "CheckSongCacheOnLoad", m_bCheckSongCacheOnLoad ); + ini.SetValue( "Options", "FastLoad", m_bFastLoad ); ini.SetValue( "Options", "MusicWheelUsesSections", m_MusicWheelUsesSections ); ini.SetValue( "Options", "MusicWheelSwitchSpeed", m_iMusicWheelSwitchSpeed ); ini.SetValue( "Options", "EasterEggs", m_bEasterEggs ); diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h index 236d49f096..e82d189f39 100644 --- a/stepmania/src/PrefsManager.h +++ b/stepmania/src/PrefsManager.h @@ -48,7 +48,7 @@ public: bool m_bDelayedScreenLoad; enum BannerCacheMode { BNCACHE_OFF, BNCACHE_LOW_RES, BNCACHE_FULL }; BannerCacheMode m_BannerCache; - bool m_bCheckSongCacheOnLoad; + bool m_bFastLoad; bool m_bOnlyDedicatedMenuButtons; bool m_bMenuTimer; diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp index fd04b59506..a41405319a 100644 --- a/stepmania/src/ScreenOptionsMasterPrefs.cpp +++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp @@ -212,7 +212,7 @@ MOVE( Lyrics, PREFSMAN->m_bShowLyrics ); /* Misc. options */ MOVE( AutogenMissingTypes, PREFSMAN->m_bAutogenMissingTypes ); MOVE( AutogenGroupCourses, PREFSMAN->m_bAutogenGroupCourses ); -MOVE( CheckSongCacheOnLoad, PREFSMAN->m_bCheckSongCacheOnLoad ); +MOVE( FastLoad, PREFSMAN->m_bFastLoad ); /* Background options */ MOVE( BackgroundMode, PREFSMAN->m_BackgroundMode ); @@ -424,7 +424,7 @@ static const ConfOption g_ConfOptions[] = /* Misc options */ ConfOption( "Autogen\nMissing Types", AutogenMissingTypes, "OFF","ON" ), ConfOption( "Autogen\nGroup Courses", AutogenGroupCourses, "OFF","ON" ), - ConfOption( "Fast\nLoad", CheckSongCacheOnLoad,"OFF","ON" ), + ConfOption( "Fast\nLoad", FastLoad, "OFF","ON" ), /* Background options */ ConfOption( "Background\nMode", BackgroundMode, "OFF","ANIMATIONS","VISUALIZATIONS","RANDOM MOVIES" ), diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index d9c5952db7..398d9f0c49 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -190,8 +190,8 @@ NotesLoader *Song::MakeLoader( CString sDir ) const static set BlacklistedImages; /* - * If PREFSMAN->m_bCheckSongCacheOnLoad is false, always load from cache if possible. - * Don't load the contents of sDir if we can avoid it. That means we can't call HasMusic(), + * If PREFSMAN->m_bFastLoad is true, always load from cache if possible. Don't read + * the contents of sDir if we can avoid it. That means we can't call HasMusic(), * HasBanner() or GetHashForDirectory(). * * If true, check the directory hash and reload the song from scratch if it's changed. @@ -222,7 +222,7 @@ bool Song::LoadFromSongDir( CString sDir ) bool bUseCache = true; if( !DoesFileExist(GetCacheFilePath()) ) bUseCache = false; - if( PREFSMAN->m_bCheckSongCacheOnLoad && GetHashForDirectory(m_sSongDir) != uDirHash ) + if( !PREFSMAN->m_bFastLoad && GetHashForDirectory(m_sSongDir) != uDirHash ) bUseCache = false; // this cache is out of date if( bUseCache ) diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 9ee4194a27..807ffe0e55 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -98,16 +98,16 @@ void SongManager::Reload() m_sGroupNames.clear(); m_sGroupBannerPaths.clear(); - /* Always do m_bCheckSongCacheOnLoad. */ - const bool OldVal = PREFSMAN->m_bCheckSongCacheOnLoad; - PREFSMAN->m_bCheckSongCacheOnLoad = true; + /* Always check songs for changes. */ + const bool OldVal = PREFSMAN->m_bFastLoad; + PREFSMAN->m_bFastLoad = false; InitSongsFromDisk(NULL); InitCoursesFromDisk(NULL); InitAutogenCourses(); PROFILEMAN->InitMachineScoresFromDisk(); - PREFSMAN->m_bCheckSongCacheOnLoad = OldVal; + PREFSMAN->m_bFastLoad = OldVal; } void SongManager::InitSongsFromDisk( LoadingWindow *ld )