From 5ec6fbad105d95458975fe398a28f32fb9785254 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 2 Nov 2003 00:25:02 +0000 Subject: [PATCH] simplify --- stepmania/src/NoteData.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index f62b5618e7..94d3d14c94 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -473,20 +473,9 @@ void NoteData::LoadOverlapped( const NoteData* pOriginal, int iNewNumTracks ) const int iTracksToOverlap = iOriginalTracks / iNewNumTracks; if( iTracksToOverlap ) { - // if we have at least as many tracks in the old mode - // as we do in the mode we're going to - for (int ix = 0; ix < iNewNumTracks; ix++) + for ( int i = 0; i < iOriginalTracks; i++ ) { - for (int iy = 0; iy < iTracksToOverlap; iy++) - { - CombineTracks( ix, ix + iy * iNewNumTracks ); - } - } - const int iUnevenTracks = iOriginalTracks % iNewNumTracks; - for (int ix = iOriginalTracks - iUnevenTracks; ix < iOriginalTracks; ix++) - { - // spread out the remaining tracks evenly - CombineTracks( (ix * iOriginalTracks) % iNewNumTracks, ix ); + CombineTracks( i % iNewNumTracks, i ); } } SetNumTracks( iNewNumTracks );