From e462049c1608c7accf82f5eb098ea3d98a52413a Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 14 May 2011 00:57:34 -0400 Subject: [PATCH] [splittiming] No more holds/rolls on Song Timing. --- src/ScreenEdit.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 2ff3b112dc..8ba386b31a 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -2584,17 +2584,20 @@ void ScreenEdit::ScrollTo( float fDestinationBeat ) if( !EditIsBeingPressed(b) ) continue; - // create a new hold note - int iStartRow = BeatToNoteRow( min(fOriginalBeat, fDestinationBeat) ); - int iEndRow = BeatToNoteRow( max(fOriginalBeat, fDestinationBeat) ); + if( GAMESTATE->m_bIsEditorStepTiming ) + { + // create a new hold note + int iStartRow = BeatToNoteRow( min(fOriginalBeat, fDestinationBeat) ); + int iEndRow = BeatToNoteRow( max(fOriginalBeat, fDestinationBeat) ); - // Don't SaveUndo. We want to undo the whole hold, not just the last segment - // that the user made. Dragging the hold bigger can only absorb and remove - // other taps, so dragging won't cause us to exceed the note limit. - TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_ROLL) ? TAP_ORIGINAL_ROLL_HEAD : TAP_ORIGINAL_HOLD_HEAD; + // Don't SaveUndo. We want to undo the whole hold, not just the last segment + // that the user made. Dragging the hold bigger can only absorb and remove + // other taps, so dragging won't cause us to exceed the note limit. + TapNote tn = EditIsBeingPressed(EDIT_BUTTON_LAY_ROLL) ? TAP_ORIGINAL_ROLL_HEAD : TAP_ORIGINAL_HOLD_HEAD; - tn.pn = m_InputPlayerNumber; - m_NoteDataEdit.AddHoldNote( iCol, iStartRow, iEndRow, tn ); + tn.pn = m_InputPlayerNumber; + m_NoteDataEdit.AddHoldNote( iCol, iStartRow, iEndRow, tn ); + } } if( EditIsBeingPressed(EDIT_BUTTON_SCROLL_SELECT) )