From 206363742d4883e190f32616e7d4168f44a08ed4 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 Jan 2005 21:37:40 +0000
Subject: [PATCH] remove 4s

---
 stepmania/src/NoteData.cpp | 59 --------------------------------------
 stepmania/src/NoteData.h   |  5 ----
 2 files changed, 64 deletions(-)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 05065660a2..0d237df310 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -408,9 +408,6 @@ bool NoteData::IsHoldNoteAtBeat( int iTrack, int iRow, int *pHeadRow, int *pTail
 			case TapNote::autoKeysound:
 				/* ignore */
 				continue;
-			case TapNote::hold:
-				/* Don't call this function when in 4s mode! */
-				FAIL_M("hold");
 			default:
 				FAIL_M( ssprintf("%i", tn.type) );
 			}
@@ -456,9 +453,6 @@ bool NoteData::IsHoldNoteAtBeat( int iTrack, int iRow, int *pHeadRow, int *pTail
 			case TapNote::autoKeysound:
 				/* ignore */
 				continue;
-			case TapNote::hold:
-				/* Don't call this function when in 4s mode! */
-				FAIL_M("hold");
 			default:
 				FAIL_M( ssprintf("%i", tn.type) );
 			}
@@ -725,59 +719,6 @@ void NoteData::From2sAnd3s( const NoteData& from )
 	Convert2sAnd3sToHoldNotes();
 }
 
-void NoteData::To4s( const NoteData& from )
-{
-	CopyAll( from );
-	ConvertHoldNotesTo4s();
-}
-
-void NoteData::From4s( const NoteData& from )
-{
-	CopyAll( from );
-	Convert4sToHoldNotes();
-}
-
-/* "104444001" ==
- * "102000301"
- *
- * "4441" basically means "hold for three rows then hold for another tap";
- * since taps don't really have a length, it's equivalent to "4440".
- * So, make sure the character after a 4 is always a 0. */
-void NoteData::Convert4sToHoldNotes()
-{
-	for( int t=0; t<GetNumTracks(); t++ )	// foreach column
-	{
-		FOREACH_NONEMPTY_ROW_IN_TRACK( *this, t, r )
-		{
-			if( GetTapNote(t, r).type == TapNote::hold )	// this is a HoldNote body
-			{
-				HoldNote hn( t, r, 0 );
-				// search for end of HoldNote
-				do {
-					SetTapNote( t, r, TAP_EMPTY );
-					r++;
-				} while( GetTapNote(t, r).type == TapNote::hold );
-				SetTapNote( t, r, TAP_EMPTY );
-
-				hn.iEndRow = r;
-				AddHoldNote( hn );
-			}
-		}
-	}
-}
-
-void NoteData::ConvertHoldNotesTo4s()
-{
-	// copy HoldNotes into the new structure, but expand them into 4s
-	for( int i=0; i<GetNumHoldNotes(); i++ ) 
-	{
-		const HoldNote &hn = GetHoldNote(i);
-		for( int j = hn.iStartRow; j < hn.iEndRow; ++j)
-			SetTapNote(hn.iTrack, j, TAP_ORIGINAL_HOLD);
-	}
-	m_HoldNotes.clear();
-}
-
 // -1 for iOriginalTracksToTakeFrom means no track
 void NoteData::LoadTransformed( const NoteData& in, int iNewNumTracks, const int iOriginalTrackToTakeFrom[] )
 {
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index d7c587c075..6aa412d481 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -139,11 +139,6 @@ public:
 	void ConvertHoldNotesTo2sAnd3s();
 	void To2sAnd3s( const NoteData& from );
 	void From2sAnd3s( const NoteData& from );
-
-	void Convert4sToHoldNotes();
-	void ConvertHoldNotesTo4s();
-	void To4s( const NoteData& from );
-	void From4s( const NoteData& from );
 };