From 59a80204778ca2c3713b88a7e84c151d266f8276 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 1 Nov 2003 19:49:29 +0000 Subject: [PATCH] Cleanup. Fix warning. --- stepmania/src/NoteData.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 1b474de121..0f0a4f8805 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -572,19 +572,19 @@ void NoteData::EliminateAllButOneTap(int row) } } -// MD 10/29/03 - This is necessary, for whatever reason. void NoteData::CombineTracks( int iTrackTo, int iTrackFrom ) { LOG->Trace("NoteData::CombineTracks( %i , %i )", iTrackTo, iTrackFrom); - if(iTrackFrom < 0 || iTrackTo < 0) return; - int iLastRow = GetMaxRow(); + if( iTrackFrom < 0 || iTrackTo < 0 ) + return; + + const int iLastRow = GetMaxRow(); LOG->Trace("NoteData::CombineTracks - %i rows", iLastRow); - for (int row = 0; row < iLastRow; ++row) + for( int row = 0; row < iLastRow; ++row ) { - LOG->Trace("NoteData::CombineTracks - row %i", row); - int iStepFrom = m_TapNotes[iTrackFrom][row]; - int iStepTo = m_TapNotes[iTrackTo][row]; + const TapNote iStepFrom = m_TapNotes[iTrackFrom][row]; + const TapNote iStepTo = m_TapNotes[iTrackTo][row]; if( iStepFrom == iStepTo ) {