Combos branch: allow editing combo factor.

Need to check something on the default branch
before this gets pushed there: something may still
be off.
This commit is contained in:
Jason Felds
2011-03-05 01:44:58 -05:00
parent 994e7d9fa1
commit 6204de38a7
7 changed files with 63 additions and 9 deletions
+1 -8
View File
@@ -227,14 +227,7 @@ float TimingData::GetDelayAtRow( int iRow ) const
int TimingData::GetComboAtRow( int iNoteRow ) const
{
for( unsigned i=0; i<m_ComboSegments.size(); i++ )
{
if( m_ComboSegments[i].m_iStartRow == iNoteRow )
{
return m_ComboSegments[i].m_iCombo;
}
}
return 0;
return m_ComboSegments[GetComboSegmentIndexAtRow( iNoteRow )].m_iCombo;
}
int TimingData::GetWarpToRow( int iWarpBeginRow ) const