Start of a new branch "warps".

Ensure that all warps are forward facing for now.
This commit is contained in:
Jason Felds
2011-03-24 19:22:11 -04:00
parent 6f504f6317
commit 36f728d88e
+2 -2
View File
@@ -328,8 +328,8 @@ struct WarpSegment
* @param s the starting row of this segment. * @param s the starting row of this segment.
* @param r the row to warp to. * @param r the row to warp to.
*/ */
WarpSegment( int s, int r ): m_iStartRow(max(0, s)), WarpSegment( int s, int r ): m_iStartRow(max(0, (s < r ? s : r)),
m_fWarpBeats(max(0, NoteRowToBeat(r))) {} m_fWarpBeats(max(0, NoteRowToBeat((r > s ? r : s)))) {}
/** /**
* @brief Creates a Warp Segment with the specified starting row and beat to warp to. * @brief Creates a Warp Segment with the specified starting row and beat to warp to.
* @param s the starting row of this segment. * @param s the starting row of this segment.