things
ksfs are still broken
This commit is contained in:
@@ -0,0 +1,383 @@
|
|||||||
|
#TITLE:?;
|
||||||
|
#BPM:150;
|
||||||
|
#STARTTIME:0;
|
||||||
|
#PLAYER:SINGLE;
|
||||||
|
#TICKCOUNT:4;
|
||||||
|
#SONGFILE:song.ogg;
|
||||||
|
#STEP:
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0100100000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0010000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0010000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0010000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
|T2|
|
||||||
|
1001000000000
|
||||||
|
0000000000000
|
||||||
|
0010000000000
|
||||||
|
0000000000000
|
||||||
|
0010000000000
|
||||||
|
0000000000000
|
||||||
|
0010000000000
|
||||||
|
0000000000000
|
||||||
|
|T1|
|
||||||
|
0100100000000
|
||||||
|
0010000000000
|
||||||
|
0010000000000
|
||||||
|
0010000000000
|
||||||
|
|T4|
|
||||||
|
1001000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
0000000000000
|
||||||
|
2222222222222
|
||||||
Binary file not shown.
@@ -313,11 +313,13 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
|
|||||||
|
|
||||||
else if( BeginsWith(sRowString, "|") )
|
else if( BeginsWith(sRowString, "|") )
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
if (bKIUCompliant)
|
if (bKIUCompliant)
|
||||||
{
|
{
|
||||||
// Log an error, ignore the line.
|
// Log an error, ignore the line.
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
// gotta do something tricky here: if the bpm is below one then a couple of calculations
|
// gotta do something tricky here: if the bpm is below one then a couple of calculations
|
||||||
// for scrollsegments will be made, example, bpm 0.2, tick 4000, the scrollsegment will
|
// for scrollsegments will be made, example, bpm 0.2, tick 4000, the scrollsegment will
|
||||||
// be 0. if the tickcount is non a stepmania standard then it will be adapted, a scroll
|
// be 0. if the tickcount is non a stepmania standard then it will be adapted, a scroll
|
||||||
@@ -325,6 +327,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
|
|||||||
// eh better do it considering the tickcount (high tickcounts)
|
// eh better do it considering the tickcount (high tickcounts)
|
||||||
|
|
||||||
// I'm making some experiments, please spare me...
|
// I'm making some experiments, please spare me...
|
||||||
|
//continue;
|
||||||
|
|
||||||
RString temp = sRowString.substr(2,sRowString.size()-3);
|
RString temp = sRowString.substr(2,sRowString.size()-3);
|
||||||
float numTemp = StringToFloat(temp);
|
float numTemp = StringToFloat(temp);
|
||||||
@@ -583,11 +586,11 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
|
|||||||
else if ( sValueName=="STARTTIME3" )
|
else if ( sValueName=="STARTTIME3" )
|
||||||
{
|
{
|
||||||
// STARTTIME3 only ensures this is a KIU compliant simfile.
|
// STARTTIME3 only ensures this is a KIU compliant simfile.
|
||||||
bKIUCompliant = true;
|
//bKIUCompliant = true;
|
||||||
}
|
}
|
||||||
else if ( sValueName=="TICKCOUNT" )
|
else if ( sValueName=="TICKCOUNT" )
|
||||||
{
|
{
|
||||||
ProcessTickcounts(sParams[1], iTickCount, out.m_SongTiming);
|
//ProcessTickcounts(sParams[1], iTickCount, out.m_SongTiming);
|
||||||
}
|
}
|
||||||
else if ( sValueName=="STEP" )
|
else if ( sValueName=="STEP" )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -235,6 +235,8 @@ void TimingData::SetWarpAtRow( int iRow, float fNew )
|
|||||||
/* Change an existing Tickcount segment, merge identical segments together or insert a new one. */
|
/* Change an existing Tickcount segment, merge identical segments together or insert a new one. */
|
||||||
void TimingData::SetTickcountAtRow( int iRow, int iTicks )
|
void TimingData::SetTickcountAtRow( int iRow, int iTicks )
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "TimingData::SetTickcountAtRow( '%i' , '%i' )", iRow, iTicks );
|
||||||
|
|
||||||
unsigned i;
|
unsigned i;
|
||||||
vector<TimingSegment *> &ticks = this->allTimingSegments[SEGMENT_TICKCOUNT];
|
vector<TimingSegment *> &ticks = this->allTimingSegments[SEGMENT_TICKCOUNT];
|
||||||
for( i=0; i<ticks.size(); i++ )
|
for( i=0; i<ticks.size(); i++ )
|
||||||
|
|||||||
Reference in New Issue
Block a user