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

Remove superfluous check--StringToFloat does it already. Ensure 0 < low meter <= high meter. Do not throw if we cannot read the course file, merely note it in the log.

Browse Source
This commit is contained in:
Steve Checkoway
2006-06-14 09:59:58 +00:00
parent 51699fb757
commit ffd790a834
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CourseLoaderCRS.cpp
+7 -4
View File
@@ -63,9 +63,6 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou
else if( 0 == stricmp(sValueName, "GAINSECONDS") ) else if( 0 == stricmp(sValueName, "GAINSECONDS") )
{ {
fGainSeconds = StringToFloat( sParams[1] ); fGainSeconds = StringToFloat( sParams[1] );
if( !finite(fGainSeconds) )
fGainSeconds = 0.0f;
} }
else if( 0 == stricmp(sValueName, "METER") ) else if( 0 == stricmp(sValueName, "METER") )
{ {
@@ -225,6 +222,8 @@ bool CourseLoaderCRS::LoadFromMsd( const RString &sPath, const MsdFile &msd, Cou
new_entry.stepsCriteria.m_iLowMeter = 3; new_entry.stepsCriteria.m_iLowMeter = 3;
new_entry.stepsCriteria.m_iHighMeter = 6; new_entry.stepsCriteria.m_iHighMeter = 6;
} }
new_entry.stepsCriteria.m_iLowMeter = max( new_entry.stepsCriteria.m_iLowMeter, 1 );
new_entry.stepsCriteria.m_iHighMeter = max( new_entry.stepsCriteria.m_iHighMeter, new_entry.stepsCriteria.m_iLowMeter );
} }
{ {
@@ -341,7 +340,11 @@ bool CourseLoaderCRS::LoadFromCRSFile( const RString &_sPath, Course &out )
MsdFile msd; MsdFile msd;
if( !msd.ReadFile(sPath) ) if( !msd.ReadFile(sPath) )
RageException::Throw( "Error opening CRS file '%s'.", sPath.c_str() ); {
LOG->Trace( "Error opening CRS file '%s': %s.", sPath.c_str(), msd.GetError().c_str() );
return false;
}
if( !LoadFromMsd(sPath, msd, out, bUseCache) ) if( !LoadFromMsd(sPath, msd, out, bUseCache) )
return false; return false;