make FIRSTBEAT and LASTBEAT match the rest of the cache-only values.
fix LASTBEAT to actually ignore the value when not from cache, rather than say we're ignoring it and still use it anyway.
This commit is contained in:
@@ -301,16 +301,13 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out )
|
|||||||
* these, so make sure we always calculate it ourself. */
|
* these, so make sure we always calculate it ourself. */
|
||||||
else if( sValueName=="FIRSTBEAT" )
|
else if( sValueName=="FIRSTBEAT" )
|
||||||
{
|
{
|
||||||
if(!FromCache)
|
if( FromCache )
|
||||||
continue;
|
out.m_fFirstBeat = StringToFloat( sParams[1] );
|
||||||
out.m_fFirstBeat = StringToFloat( sParams[1] );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else if( sValueName=="LASTBEAT" )
|
else if( sValueName=="LASTBEAT" )
|
||||||
{
|
{
|
||||||
if(!FromCache)
|
if( FromCache )
|
||||||
LOG->Trace("Ignored #LASTBEAT (cache only)");
|
out.m_fLastBeat = StringToFloat( sParams[1] );
|
||||||
out.m_fLastBeat = StringToFloat( sParams[1] );
|
|
||||||
}
|
}
|
||||||
else if( sValueName=="SONGFILENAME" )
|
else if( sValueName=="SONGFILENAME" )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user