From ee9f4d99a59de0007c7a8f4dacb48c384d0fb1e2 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 11 Feb 2003 21:41:43 +0000
Subject: [PATCH] Fixed super-shuffle.  It's sad that it was broken for so
 long!

---
 stepmania/src/NoteData.cpp       | 53 ++++++++++++--------------------
 stepmania/src/Notes.cpp          |  5 +--
 stepmania/src/ScreenEditMenu.cpp |  2 +-
 3 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 1182e65c53..fb5a5de3d3 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -916,51 +916,36 @@ void NoteDataUtil::Turn( NoteData &in, PlayerOptions::TurnType tt )
 	in.Convert2sAnd3sToHoldNotes();
 
 
-
-
-
 	if( tt == PlayerOptions::TURN_SUPER_SHUFFLE )
 	{
 		// We already did the normal shuffling code above, which did a good job
 		// of shuffling HoldNotes without creating impossible patterns.
-		// Now, go in and shuffle the TapNotes some more.
-
-		// clear tempNoteData because we're going to use it as a scratch buffer again
-		tempNoteData.Init();
-		tempNoteData.Config(in);
-
-		// copy all HoldNotes before copying taps
-		for( int i=0; i<in.GetNumHoldNotes(); i++ )
-			tempNoteData.AddHoldNote( in.GetHoldNote(i) );
-
+		// Now, go in and shuffle the TapNotes per-row.
 		in.ConvertHoldNotesTo4s();
-
-		for( int r=0; r<=in.GetLastRow(); r++ )	// foreach row
+		for( int r=0; r<=max_row; r++ )
 		{
-			if( in.IsRowEmpty(r) )
-				continue;	// no need to super shuffle this row
-
-			// shuffle this row
-			vector<int> aiTracksThatCouldHaveTapNotes;
-			for( t=0; t<in.GetNumTracks(); t++ )
-				if( in.GetTapNote(t, r) != TAP_HOLD )	// any point that isn't part of a hold
-					aiTracksThatCouldHaveTapNotes.push_back( t );
-
-			for( t=0; t<in.GetNumTracks(); t++ )
+			for( int t1=0; t1<in.GetNumTracks(); t1++ )
 			{
-				if( in.GetTapNote(t, r) != TAP_HOLD  &&  in.GetTapNote(t, r) != TAP_EMPTY )	// there is a tap note here (and not a HoldNote)
+				TapNote tn1 = in.GetTapNote(t1, r);
+				if( tn1!='4' )	// a tap that is not part of a hold
 				{
-					int iRandIndex = rand() % aiTracksThatCouldHaveTapNotes.size();
-					int iTo = aiTracksThatCouldHaveTapNotes[ iRandIndex ];
-					aiTracksThatCouldHaveTapNotes.erase( aiTracksThatCouldHaveTapNotes.begin()+iRandIndex,
-													     aiTracksThatCouldHaveTapNotes.begin()+iRandIndex+1 );
-	
-					tempNoteData.SetTapNote(iTo, r, in.GetTapNote(t, r));
+					// probe for a spot to swap with
+					while( 1 )
+					{
+						int t2 = rand() % in.GetNumTracks();
+						TapNote tn2 = in.GetTapNote(t2, r);
+						if( tn2!='4' )	// a tap that is not part of a hold
+						{
+							// swap
+							in.SetTapNote(t1, r, tn2);
+							in.SetTapNote(t2, r, tn1);
+							break;
+						}
+					}
 				}
 			}
 		}
-
-		in.CopyAll( &tempNoteData );		// copy note data from newData back into this
+		in.Convert4sToHoldNotes();
 	}
 }
 
diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp
index 48269a448d..c7c2dab555 100644
--- a/stepmania/src/Notes.cpp
+++ b/stepmania/src/Notes.cpp
@@ -267,10 +267,7 @@ void Notes::AutogenFrom( Notes *parent_, NotesType ntTo )
 
 void Notes::BakeAutoGen()
 {
-	NoteData noteData;
-	parent->GetNoteData( &noteData );
-	this->SetNoteData( &noteData );		// this will call DeAutoGen
-
+	Decompress();
 	parent = NULL;
 }
 
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 1489c2aab0..3ad77bd825 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -158,7 +158,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
 
 	if( !pSong->HasMusic() )
 	{
-		SCREENMAN->Prompt( SM_None, "This song is missing a music file and cannot be edited" );
+		SCREENMAN->Prompt( SM_None, "This song is missing a music file\nand cannot be edited" );
 		return;
 	}