From f55f7e0a08898ba0c016ee9c8abbcedc42e101a7 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 Jan 2005 05:15:18 +0000
Subject: [PATCH] NoteData::LoadTransformed fix

---
 stepmania/src/NoteData.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index c5800f409b..dd6944a298 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -311,8 +311,6 @@ void NoteData::AddHoldNote( HoldNote add )
 	ASSERT( add.iStartRow>=0 && add.iEndRow>=0 );
 
 	// look for other hold notes that overlap and merge them
-	// XXX: this is done implicitly with 4s, but 4s uses this function.
-	// Rework this later.
 	for( int i=0; i<GetNumHoldNotes(); i++ )	// for each HoldNote
 	{
 		HoldNote &other = GetHoldNote(i);
@@ -712,9 +710,17 @@ void NoteData::LoadTransformed( const NoteData& in, int iNewNumTracks, const int
 	}
 
 	// 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
 	{
-		const HoldNote &hn = in.GetHoldNote(i);
+		HoldNote hn = in.GetHoldNote(i);
+		hn.iTrack = iInverseMapping[hn.iTrack];
 		this->AddHoldNote( hn );
 	}
 }