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

Fix reading pre-split timing ssc files.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+9
View File
@@ -4,6 +4,15 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
________________________________________________________________________________
================================================================================
StepMania 5.0 ????????? | 2011????
--------------------------------------------------------------------------------
2011/08/21
----------
* [NotesLoaderSSC] Fix loading pre-split timing files that had blank timing
tags inside of them. Thanks to Vin.il for the catch. [Wolfman2000]
================================================================================
StepMania 5.0 Preview 3 | 20110820
--------------------------------------------------------------------------------
src/NotesLoaderSSC.cpp
+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" )
src/Song.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
* @brief The internal version of the cache for StepMania.
*
* Increment this value to invalidate the current cache. */
const int FILE_CACHE_VERSION = 201;
const int FILE_CACHE_VERSION = 202;
/** @brief How long does a song sample last by default? */
const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;