From 7c3d52ee001f08fc00df4a35c3a32c1191988dda Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 19 Dec 2005 00:10:53 +0000 Subject: [PATCH] naming cleanup --- stepmania/src/ScreenEdit.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index f1d6440218..bd8fa8a97b 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -2910,14 +2910,14 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns default: ASSERT(0); } - int iOldClipboardBeats = m_NoteFieldEdit.m_iEndMarker - m_NoteFieldEdit.m_iBeginMarker; - int iNewClipboardBeats = lrintf( iOldClipboardBeats * fScale ); - int iDeltaBeats = iNewClipboardBeats - iOldClipboardBeats; - int iNewClipboardEndBeat = m_NoteFieldEdit.m_iBeginMarker + iNewClipboardBeats; - if( iDeltaBeats > 0 ) - NoteDataUtil::InsertRows( m_NoteDataEdit, m_NoteFieldEdit.m_iBeginMarker, iDeltaBeats ); + int iOldClipboardRow = m_NoteFieldEdit.m_iEndMarker - m_NoteFieldEdit.m_iBeginMarker; + int iNewClipboardRow = lrintf( iOldClipboardRow * fScale ); + int iDeltaRows = iNewClipboardRow - iOldClipboardRow; + int iNewClipboardEndRow = m_NoteFieldEdit.m_iBeginMarker + iNewClipboardRow; + if( iDeltaRows > 0 ) + NoteDataUtil::InsertRows( m_NoteDataEdit, m_NoteFieldEdit.m_iBeginMarker, iDeltaRows ); else - NoteDataUtil::DeleteRows( m_NoteDataEdit, m_NoteFieldEdit.m_iBeginMarker, -iDeltaBeats ); + NoteDataUtil::DeleteRows( m_NoteDataEdit, m_NoteFieldEdit.m_iBeginMarker, -iDeltaRows ); m_pSong->m_Timing.ScaleRegion( fScale, m_NoteFieldEdit.m_iBeginMarker, m_NoteFieldEdit.m_iEndMarker ); @@ -2941,12 +2941,12 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns sIter[i]->SetNoteData( ndTemp ); } - m_NoteFieldEdit.m_iEndMarker = iNewClipboardEndBeat; + m_NoteFieldEdit.m_iEndMarker = iNewClipboardEndRow; float fOldBPM = m_pSong->GetBPMAtBeat( NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker) ); float fNewBPM = fOldBPM * fScale; m_pSong->m_Timing.SetBPMAtRow( m_NoteFieldEdit.m_iBeginMarker, fNewBPM ); - m_pSong->m_Timing.SetBPMAtRow( iNewClipboardEndBeat, fOldBPM ); + m_pSong->m_Timing.SetBPMAtRow( iNewClipboardEndRow, fOldBPM ); } break; case play: