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

Fix hash check for course cache files. Do not attempt to calculate radar values if there are no entries.

Browse Source
This commit is contained in:
Steve Checkoway
2008-07-28 05:47:45 +00:00
parent 6801ad6469
commit ec3d626b46
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CourseLoaderCRS.cpp
+5 -3
View File
@@ -318,7 +318,9 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou
/* Cache and load the course banner. Only bother doing this if at least one /* Cache and load the course banner. Only bother doing this if at least one
* song was found in the course. */ * song was found in the course. */
if( out.m_sBannerPath != "" && !out.m_vEntries.empty() ) if( out.m_vEntries.empty() )
return true;
if( out.m_sBannerPath != "" )
BANNERCACHE->CacheBanner( out.GetBannerPath() ); BANNERCACHE->CacheBanner( out.GetBannerPath() );
/* Cache each trail RadarValues that's slow to load, so we /* Cache each trail RadarValues that's slow to load, so we
@@ -356,7 +358,7 @@ bool CourseLoaderCRS::LoadFromCRSFile( const RString &_sPath, Course &out )
unsigned uHash = SONGINDEX->GetCacheHash( out.m_sPath ); unsigned uHash = SONGINDEX->GetCacheHash( out.m_sPath );
if( !DoesFileExist(out.GetCacheFilePath()) ) if( !DoesFileExist(out.GetCacheFilePath()) )
bUseCache = false; bUseCache = false;
if( !PREFSMAN->m_bFastLoad && GetHashForDirectory(out.m_sPath) != uHash ) if( !PREFSMAN->m_bFastLoad && GetHashForFile(out.m_sPath) != uHash )
bUseCache = false; // this cache is out of date bUseCache = false; // this cache is out of date
} }
@@ -364,7 +366,7 @@ bool CourseLoaderCRS::LoadFromCRSFile( const RString &_sPath, Course &out )
{ {
RString sCacheFile = out.GetCacheFilePath(); RString sCacheFile = out.GetCacheFilePath();
LOG->Trace( "CourseLoaderCRS::LoadFromCRSFile(\"%s\") (\"%s\")", sPath.c_str(), sCacheFile.c_str() ); LOG->Trace( "CourseLoaderCRS::LoadFromCRSFile(\"%s\") (\"%s\")", sPath.c_str(), sCacheFile.c_str() );
sPath = sCacheFile.c_str(); sPath = sCacheFile;
} }
else else
{ {