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

[notesloader] Have common ground.

Browse Source
This commit is contained in:
Jason Felds
2011-06-09 14:45:30 -04:00
parent e37fe84d6a
commit 48eefc7700
6 changed files with 101 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSSC.cpp
+2 -54
View File
@@ -97,10 +97,10 @@ void SSCLoader::ProcessLabels( TimingData &out, const RString sParam )
}
}
void SSCLoader::ProcessCombos( TimingData &out, const RString sParam )
void SSCLoader::ProcessCombos( TimingData &out, const RString line, const int rowsPerBeat )
{
vector<RString> arrayComboExpressions;
split( sParam, ",", arrayComboExpressions );
split( line, ",", arrayComboExpressions );
for( unsigned f=0; f<arrayComboExpressions.size(); f++ )
{
@@ -119,53 +119,6 @@ void SSCLoader::ProcessCombos( TimingData &out, const RString sParam )
}
}
void SSCLoader::ProcessSpeeds( TimingData &out, const RString sParam )
{
vector<RString> vs1;
split( sParam, ",", vs1 );
FOREACH_CONST( RString, vs1, s1 )
{
vector<RString> vs2;
split( *s1, "=", vs2 );
if( vs2[0] == 0 && vs2.size() == 2 ) // First one always seems to have 2.
{
vs2.push_back("0");
}
if( vs2.size() == 3 ) // use beats by default.
{
vs2.push_back("0");
}
if( vs2.size() < 4 )
{
LOG->UserLog( "Song file", "(UNKNOWN)", "has an speed change with %i values.", (int)vs2.size() );
continue;
}
const float fBeat = StringToFloat( vs2[0] );
SpeedSegment seg( fBeat, StringToFloat( vs2[1] ), StringToFloat( vs2[2] ));
seg.SetUnit(StringToInt(vs2[3]));
if( fBeat < 0 )
{
LOG->UserLog( "Song file", "(UNKNOWN)", "has an speed change with beat %f.", fBeat );
continue;
}
if( seg.GetLength() < 0 )
{
LOG->UserLog( "Song file", "(UNKNOWN)", "has an speed change with beat %f, length %f.", fBeat, seg.GetLength() );
continue;
}
out.AddSpeedSegment( seg );
}
}
void SSCLoader::ProcessScrolls( TimingData &out, const RString sParam )
{
vector<RString> vs1;
@@ -906,11 +859,6 @@ bool SSCLoader::LoadEditFromMsd( const MsdFile &msd, const RString &sEditFilePat
return bSSCFormat;
}
void SSCLoader::TidyUpData( Song &song, bool bFromCache )
{
SMLoader::TidyUpData(song, bFromCache);
}
/*
* (c) 2011 Jason Felds
* All rights reserved.