Fix reading pre-split timing ssc files.

Welcome to the first cache of the next series.
Start placing your bets again on what the final
cache value will be for SM5 final.

As a reminder, we are on cache version 202 now.
This commit is contained in:
Jason Felds
2011-08-21 01:19:50 -04:00
parent 11259af04b
commit acaaf1bfba
3 changed files with 75 additions and 27 deletions
+65 -26
View File
@@ -623,81 +623,120 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
else if( sValueName=="BPMS" )
{
if( SMLoader::ProcessBPMs(stepsTiming, sParams[1]) )
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
if( SMLoader::ProcessBPMs(stepsTiming, sParams[1]) )
bHasOwnTiming = true;
}
}
else if( sValueName=="STOPS" )
{
SMLoader::ProcessStops(stepsTiming, sParams[1]);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
SMLoader::ProcessStops(stepsTiming, sParams[1]);
bHasOwnTiming = true;
}
}
else if( sValueName=="DELAYS" )
{
SMLoader::ProcessDelays(stepsTiming, sParams[1]);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
SMLoader::ProcessDelays(stepsTiming, sParams[1]);
bHasOwnTiming = true;
}
}
else if( sValueName=="TIMESIGNATURES" )
{
SMLoader::ProcessTimeSignatures(stepsTiming, sParams[1]);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
SMLoader::ProcessTimeSignatures(stepsTiming, sParams[1]);
bHasOwnTiming = true;
}
}
else if( sValueName=="TICKCOUNTS" )
{
SMLoader::ProcessTickcounts(stepsTiming, sParams[1]);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
SMLoader::ProcessTickcounts(stepsTiming, sParams[1]);
bHasOwnTiming = true;
}
}
else if( sValueName=="COMBOS" )
{
ProcessCombos(stepsTiming, sParams[1]);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessCombos(stepsTiming, sParams[1]);
bHasOwnTiming = true;
}
}
else if( sValueName=="WARPS" )
{
ProcessWarps(stepsTiming, sParams[1], out.m_fVersion);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessWarps(stepsTiming, sParams[1], out.m_fVersion);
bHasOwnTiming = true;
}
}
else if( sValueName=="SPEEDS" )
{
ProcessSpeeds( stepsTiming, sParams[1] );
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessSpeeds( stepsTiming, sParams[1] );
bHasOwnTiming = true;
}
}
else if( sValueName=="SCROLLS" )
{
ProcessScrolls( stepsTiming, sParams[1] );
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessScrolls( stepsTiming, sParams[1] );
bHasOwnTiming = true;
}
}
else if( sValueName=="FAKES" )
{
ProcessFakes( stepsTiming, sParams[1] );
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessFakes( stepsTiming, sParams[1] );
bHasOwnTiming = true;
}
}
else if( sValueName=="LABELS" )
{
ProcessLabels(stepsTiming, sParams[1]);
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessLabels(stepsTiming, sParams[1]);
bHasOwnTiming = true;
}
}
/* If this is called, the chart does not use the same attacks
* as the Song's timing. No other changes are required. */
else if( sValueName=="ATTACKS" )
{
ProcessAttackString(pNewNotes->m_sAttackString, sParams);
ProcessAttacks(pNewNotes->m_Attacks, sParams);
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
ProcessAttackString(pNewNotes->m_sAttackString, sParams);
ProcessAttacks(pNewNotes->m_Attacks, sParams);
}
}
else if( sValueName=="OFFSET" )
{
stepsTiming.m_fBeat0OffsetInSeconds = StringToFloat( sParams[1] );
bHasOwnTiming = true;
if (out.m_fVersion >= VERSION_SPLIT_TIMING)
{
stepsTiming.m_fBeat0OffsetInSeconds = StringToFloat( sParams[1] );
bHasOwnTiming = true;
}
}
else if( sValueName=="DISPLAYBPM" )