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

[splittiming] Only care about the mod change.

Browse Source 
Nothing wrong with the rest, but for editor purposes,
this kind of takes precedence before length and unit.
This commit is contained in:
Jason Felds
2011-05-16 09:44:07 -04:00
parent 49552d41e5
commit ba8791b4f9
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+4 -7
View File
@@ -271,17 +271,14 @@ void TimingData::SetSpeedAtRow( int iRow, float fPercent, float fWait, unsigned
if ( i == m_SpeedSegments.size() || m_SpeedSegments[i].m_iStartRow != iRow ) if ( i == m_SpeedSegments.size() || m_SpeedSegments[i].m_iStartRow != iRow )
{ {
if( i == 0 || // the core mod itself matters the most for comparisons.
( m_SpeedSegments[i-1].m_fPercent != fPercent if( i == 0 || m_SpeedSegments[i-1].m_fPercent != fPercent )
|| m_SpeedSegments[i-1].m_fWait != fWait
|| m_SpeedSegments[i-1].m_usMode != usMode ) )
AddSpeedSegment( SpeedSegment(iRow, fPercent, fWait, usMode) ); AddSpeedSegment( SpeedSegment(iRow, fPercent, fWait, usMode) );
} }
else else
{ {
if( i > 0 && m_SpeedSegments[i-1].m_fPercent == fPercent // The others aren't compared: only the mod itself matters.
&& m_SpeedSegments[i-1].m_fWait == fWait if( i > 0 && m_SpeedSegments[i-1].m_fPercent == fPercent )
&& m_SpeedSegments[i-1].m_usMode == usMode )
m_SpeedSegments.erase( m_SpeedSegments.begin()+i, m_SpeedSegments.erase( m_SpeedSegments.begin()+i,
m_SpeedSegments.begin()+i+1 ); m_SpeedSegments.begin()+i+1 );
else else