From 1d84c21f5e19577f239e44aa2a35037d850b14a7 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 Jan 2005 05:39:07 +0000
Subject: [PATCH] implement NoteDataUtil::Wide without 4s

---
 stepmania/src/NoteDataUtil.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 2574721908..d6eda4ff30 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -855,7 +855,7 @@ void NoteDataUtil::Little( NoteData &inout, int iStartIndex, int iEndIndex )
 void NoteDataUtil::Wide( NoteData &inout, int iStartIndex, int iEndIndex )
 {
 	// Make all all quarter notes into jumps.
-	inout.ConvertHoldNotesTo4s();
+	inout.ConvertHoldNotesTo2sAnd3s();
 
 	/* Start on an even beat. */
 	iStartIndex = Quantize( iStartIndex, BeatToNoteRow(2.0f) );
@@ -864,7 +864,11 @@ void NoteDataUtil::Wide( NoteData &inout, int iStartIndex, int iEndIndex )
 
 	for( int i=iStartIndex; i<iEndIndex; i+=ROWS_PER_BEAT*2 ) // every even beat
 	{
-		if( inout.GetNumTapNonEmptyTracks(i) != 1 )
+		bool bHoldNoteAtBeat = false;
+		for( int t = 0; !bHoldNoteAtBeat && t < inout.GetNumTracks(); ++t )
+			if( inout.IsHoldNoteAtBeat(t, i) )
+				bHoldNoteAtBeat = true;
+		if( bHoldNoteAtBeat )
 			continue;	// skip.  Don't place during holds
 
 		if( inout.GetNumTracksWithTap(i) != 1 )
@@ -900,7 +904,7 @@ void NoteDataUtil::Wide( NoteData &inout, int iStartIndex, int iEndIndex )
 		inout.SetTapNote(iTrackToAdd, i, TAP_ADDITION_TAP);
 	}
 
-	inout.Convert4sToHoldNotes();
+	inout.Convert2sAnd3sToHoldNotes();
 }
 
 void NoteDataUtil::Big( NoteData &inout, int iStartIndex, int iEndIndex )