This commit is contained in:
Steve Checkoway
2006-07-08 06:00:37 +00:00
parent e1547e4bac
commit 5774a0a70d
+9 -5
View File
@@ -77,8 +77,9 @@ bool KSFLoader::LoadFromKSFFile( const RString &sPath, Steps &out, const Song &s
// handle the data
if( 0==stricmp(sValueName,"TICKCOUNT") )
{
iTickCount = atoi( sParams[1] );
}
else if( 0==stricmp(sValueName,"STEP") )
{
RString step = sParams[1];
@@ -86,8 +87,10 @@ bool KSFLoader::LoadFromKSFFile( const RString &sPath, Steps &out, const Song &s
split( step, "\n", asRows, true );
}
else if( 0==stricmp(sValueName,"DIFFICULTY") )
{
out.SetMeter( atoi(sParams[1]) );
}
}
if( iTickCount == -1 )
{
@@ -298,11 +301,12 @@ bool KSFLoader::LoadGlobalData( const RString &sPath, Song &out )
out.m_Timing.m_fBeat0OffsetInSeconds = -StringToFloat( sParams[1] )/100;
else if( 0==stricmp(sValueName,"TICKCOUNT") ||
0==stricmp(sValueName,"STEP") ||
0==stricmp(sValueName,"DIFFICULTY"))
; /* Handled in LoadFromKSFFile; don't warn. */
else if( 0==stricmp(sValueName,"STARTTIME2") ||
0==stricmp(sValueName,"DIFFICULTY") ||
0==stricmp(sValueName,"STARTTIME2") ||
0==stricmp(sValueName,"STARTTIME3") )
continue; /* Expected value for other Pump Simulators: don't worry about it here. */
{
continue;
}
else
LOG->Trace( "Unexpected value named '%s'", sValueName.c_str() );
}