simplify

2003-11-02 00:25:02 +00:00
parent 9bbf3d1b25
commit 5ec6fbad10
1 changed files with 2 additions and 13 deletions
@@ -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
+		for ( int i = 0; i < iOriginalTracks; i++ )
 		// as we do in the mode we're going to
 		for (int ix = 0; ix < iNewNumTracks; ix++)
 		{
-			for (int iy = 0; iy < iTracksToOverlap; iy++)
+			CombineTracks( i % iNewNumTracks, i );
 			{
 				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 );
 		}
 	}
 	SetNumTracks( iNewNumTracks );