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

Fix Stop/Delay conflicts.

Browse Source 
We REALLY need to separate these two.
This commit is contained in:
Jason Felds
2011-06-26 22:56:39 -04:00
parent 1d5f9830a3
commit 11ea4e62da
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+12 -8
View File
@@ -786,11 +786,12 @@ float TimingData::GetPreviousStopSegmentBeatAtRow( int iRow ) const
for (unsigned i = 0; i < m_StopSegments.size(); i++ )
{
const StopSegment &s = m_StopSegments[i];
if( !s.GetDelay() && s.GetRow() >= iRow )
if( s.GetRow() >= iRow )
{
break;
}
backup = s.GetBeat();
if (!s.GetDelay())
backup = s.GetBeat();
}
return (backup > -1) ? backup : NoteRowToBeat(iRow);
}
@@ -800,11 +801,12 @@ float TimingData::GetNextStopSegmentBeatAtRow( int iRow ) const
for (unsigned i = 0; i < m_StopSegments.size(); i++ )
{
const StopSegment &s = m_StopSegments[i];
if( !s.GetDelay() && s.GetRow() <= iRow )
if( s.GetRow() <= iRow )
{
continue;
}
return s.GetBeat();
if (!s.GetDelay())
return s.GetBeat();
}
return NoteRowToBeat(iRow);
}
@@ -815,11 +817,12 @@ float TimingData::GetPreviousDelaySegmentBeatAtRow( int iRow ) const
for (unsigned i = 0; i < m_StopSegments.size(); i++ )
{
const StopSegment &s = m_StopSegments[i];
if( s.GetDelay() && s.GetRow() >= iRow )
if( s.GetRow() >= iRow )
{
break;
}
backup = s.GetBeat();
if (s.GetDelay())
backup = s.GetBeat();
}
return (backup > -1) ? backup : NoteRowToBeat(iRow);
}
@@ -829,11 +832,12 @@ float TimingData::GetNextDelaySegmentBeatAtRow( int iRow ) const
for (unsigned i = 0; i < m_StopSegments.size(); i++ )
{
const StopSegment &s = m_StopSegments[i];
if( s.GetDelay() && s.GetRow() <= iRow )
if( s.GetRow() <= iRow )
{
continue;
}
return s.GetBeat();
if (s.GetDelay())
return s.GetBeat();
}
return NoteRowToBeat(iRow);
}