Always allow fast load when reloading
This commit is contained in:
@@ -177,7 +177,7 @@ void ScreenInstallOverlay::Update( float fDeltaTime )
|
||||
playAfterLaunchInfo.OverlayWith( pali2 );
|
||||
}
|
||||
if( playAfterLaunchInfo.bAnySongChanged )
|
||||
SONGMAN->Reload( false, nullptr );
|
||||
SONGMAN->Reload( nullptr );
|
||||
|
||||
if( !playAfterLaunchInfo.sSongDir.empty() )
|
||||
{
|
||||
|
||||
@@ -77,7 +77,7 @@ void ScreenReloadSongs::Update( float fDeltaTime )
|
||||
|
||||
ASSERT( !IsFirstUpdate() );
|
||||
|
||||
SONGMAN->Reload( false, m_pLoadingWindow );
|
||||
SONGMAN->Reload( m_pLoadingWindow );
|
||||
|
||||
SCREENMAN->PostMessageToTopScreen( SM_GoToNextScreen, 0 );
|
||||
}
|
||||
|
||||
+1
-8
@@ -113,7 +113,7 @@ static LocalizedString UNLOADING_SONGS ( "SongManager", "Unloading songs..." );
|
||||
static LocalizedString UNLOADING_COURSES ( "SongManager", "Unloading courses..." );
|
||||
static LocalizedString SANITY_CHECKING_GROUPS("SongManager", "Sanity checking groups...");
|
||||
|
||||
void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
|
||||
void SongManager::Reload( LoadingWindow *ld )
|
||||
{
|
||||
FILEMAN->FlushDirCache( SpecialFiles::SONGS_DIR );
|
||||
FILEMAN->FlushDirCache( SpecialFiles::COURSES_DIR );
|
||||
@@ -168,10 +168,6 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
|
||||
|
||||
FreeSongs();
|
||||
|
||||
const bool OldVal = PREFSMAN->m_bFastLoad;
|
||||
if( !bAllowFastLoad )
|
||||
PREFSMAN->m_bFastLoad.Set( false );
|
||||
|
||||
InitAll( ld );
|
||||
|
||||
// reload scores and unlocks afterward
|
||||
@@ -203,9 +199,6 @@ void SongManager::Reload( bool bAllowFastLoad, LoadingWindow *ld )
|
||||
}
|
||||
UNLOCKMAN->Reload();
|
||||
|
||||
if( !bAllowFastLoad )
|
||||
PREFSMAN->m_bFastLoad.Set( OldVal );
|
||||
|
||||
UpdatePreferredSort();
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -65,7 +65,7 @@ public:
|
||||
void InvalidateCachedTrails();
|
||||
|
||||
void InitAll( LoadingWindow *ld ); // songs, courses, groups - everything.
|
||||
void Reload( bool bAllowFastLoad, LoadingWindow *ld=nullptr ); // songs, courses, groups - everything.
|
||||
void Reload( LoadingWindow *ld=nullptr ); // songs, courses, groups - everything.
|
||||
void PreloadSongImages();
|
||||
|
||||
bool IsGroupNeverCached(const RString& group) const;
|
||||
|
||||
Reference in New Issue
Block a user