From 6d6d81cd60bd7657080052742dd4fbe1cb1fa06e Mon Sep 17 00:00:00 2001 From: Thad Ward Date: Thu, 10 Aug 2006 10:12:05 +0000 Subject: [PATCH] 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. --- stepmania/src/NotesLoaderSM.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp index 777774e7e1..b7ae48d0d8 100644 --- a/stepmania/src/NotesLoaderSM.cpp +++ b/stepmania/src/NotesLoaderSM.cpp @@ -301,16 +301,13 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out ) * these, so make sure we always calculate it ourself. */ else if( sValueName=="FIRSTBEAT" ) { - if(!FromCache) - continue; - out.m_fFirstBeat = StringToFloat( sParams[1] ); + if( FromCache ) + out.m_fFirstBeat = StringToFloat( sParams[1] ); } - else if( sValueName=="LASTBEAT" ) { - if(!FromCache) - LOG->Trace("Ignored #LASTBEAT (cache only)"); - out.m_fLastBeat = StringToFloat( sParams[1] ); + if( FromCache ) + out.m_fLastBeat = StringToFloat( sParams[1] ); } else if( sValueName=="SONGFILENAME" ) {