From 4402a37e99e32129803e5a594814e2246c3f22f0 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 20 Feb 2003 01:35:49 +0000
Subject: [PATCH] Fixed nonsense notes being inserted during holds (e.g. Sweet
 Love Magic) in Wide() and InsertIntelligentTaps()

---
 stepmania/src/NoteData.cpp | 43 +++++++++++++++++++-------------------
 stepmania/src/NoteData.h   | 15 +++++++++++++
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 33c5bd6d8f..6e7135d343 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -1017,27 +1017,28 @@ void NoteDataUtil::Wide( NoteData &in )
 	int max_row = in.GetLastRow();
 	for( int i=0; i<=max_row; i+=ROWS_PER_BEAT ) 
 	{
-		int iNum = in.GetNumTapNonEmptyTracks(i);
-		if( iNum == 1 )
-		{
-			// add a note determinitsitcally
-			int iBeat = (int)roundf( NoteRowToBeat(i) );
-			int iTrackOfNote = in.GetFirstNonEmptyTrack(i);
-			int iTrackToAdd = iTrackOfNote + (iBeat%5)-2;	// won't be more than 2 tracks away from the existing note
-			CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 );
-			if( iTrackToAdd == iTrackOfNote )
-				iTrackToAdd++;
-			CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 );
-			if( iTrackToAdd == iTrackOfNote )
-				iTrackToAdd--;
-			CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 );
+		if( in.GetNumTapNonEmptyTracks(i) != 1 )
+			continue;	// skip
+		if( in.GetNumTracksWithTap(i) != 1 )
+			continue;	// skip
 
-			if( in.GetTapNote(iTrackToAdd, i) != TAP_EMPTY )
-			{
-				iTrackToAdd = (iTrackToAdd+1) % in.GetNumTracks();
-			}
-			in.SetTapNote(iTrackToAdd, i, TAP_TAP);
+		// add a note determinitsitcally
+		int iBeat = (int)roundf( NoteRowToBeat(i) );
+		int iTrackOfNote = in.GetFirstTrackWithTap(i);
+		int iTrackToAdd = iTrackOfNote + (iBeat%5)-2;	// won't be more than 2 tracks away from the existing note
+		CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 );
+		if( iTrackToAdd == iTrackOfNote )
+			iTrackToAdd++;
+		CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 );
+		if( iTrackToAdd == iTrackOfNote )
+			iTrackToAdd--;
+		CLAMP( iTrackToAdd, 0, in.GetNumTracks()-1 );
+
+		if( in.GetTapNote(iTrackToAdd, i) != TAP_EMPTY )
+		{
+			iTrackToAdd = (iTrackToAdd+1) % in.GetNumTracks();
 		}
+		in.SetTapNote(iTrackToAdd, i, TAP_TAP);
 	}
 
 	in.Convert4sToHoldNotes();
@@ -1065,9 +1066,9 @@ void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fBeatInterval )
 		int iRowEarlier = i;
 		int iRowLater = i + rows_per_interval;
 		int iRowMiddle = i + rows_per_interval/2;
-		if( in.GetNumTapNonEmptyTracks(iRowEarlier) != 1 )
+		if( in.GetNumTapNonEmptyTracks(iRowEarlier)!=1 || in.GetNumTracksWithTap(iRowEarlier)!=1 )
 			continue;
-		if( in.GetNumTapNonEmptyTracks(iRowLater) != 1 )
+		if( in.GetNumTapNonEmptyTracks(iRowLater)!=1 || in.GetNumTracksWithTap(iRowLater)!=1 )
 			continue;
 		// there is a 4th and 8th note surrounding iRowBetween
 		
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 8130be0527..7ce5cb7d9c 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -82,6 +82,21 @@ public:
 				return t;
 		return -1;
 	}
+	inline int GetNumTracksWithTap( int index ) const
+	{
+		int iNum = 0;
+		for( int t=0; t<m_iNumTracks; t++ )
+			if( GetTapNote(t, index) == TAP_TAP )
+				iNum++;
+		return iNum;
+	}
+	inline int GetFirstTrackWithTap( int index ) const
+	{
+		for( int t=0; t<m_iNumTracks; t++ )
+			if( GetTapNote(t, index) == TAP_TAP )
+				return t;
+		return -1;
+	}
 
 	// used in edit/record
 	void AddHoldNote( HoldNote newNote );	// add note hold note merging overlapping HoldNotes and destroying TapNotes underneath