From 982ec42ab86f2c383f9397337b8f03db6cf4193b Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 Jan 2005 21:28:47 +0000
Subject: [PATCH] simplify

---
 stepmania/src/NoteData.cpp | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 4155dc134d..05065660a2 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -785,6 +785,10 @@ void NoteData::LoadTransformed( const NoteData& in, int iNewNumTracks, const int
 	Init();
 	
 	SetNumTracks( iNewNumTracks );
+	ConvertHoldNotesTo2sAnd3s();
+
+	NoteData Input;
+	Input.To2sAnd3s( in );
 
 	// copy tracks
 	for( int t=0; t<GetNumTracks(); t++ )
@@ -795,23 +799,10 @@ void NoteData::LoadTransformed( const NoteData& in, int iNewNumTracks, const int
 
 		if( iOriginalTrack == -1 )
 			continue;
-		m_TapNotes[t] = in.m_TapNotes[iOriginalTrack];
+		m_TapNotes[t] = Input.m_TapNotes[iOriginalTrack];
 	}
 
-	// copy holds
-	int iInverseMapping[MAX_NOTE_TRACKS];
-	for( int i = 0; i < iNewNumTracks; ++i )
-	{
-		int iFrom = iOriginalTrackToTakeFrom[i];
-		iInverseMapping[iFrom] = i;
-	}
-
-	for( int i=0; i<in.GetNumHoldNotes(); i++ )	// for each HoldNote
-	{
-		HoldNote hn = in.GetHoldNote(i);
-		hn.iTrack = iInverseMapping[hn.iTrack];
-		this->AddHoldNote( hn );
-	}
+	Convert2sAnd3sToHoldNotes();
 }
 
 void NoteData::MoveTapNoteTrack( int dest, int src )