From 73f5051118566e2f2ba1135d00303ae055b4c528 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 25 Apr 2005 09:33:58 +0000
Subject: [PATCH] add NoteData::GetNumRolls

---
 stepmania/src/NoteData.cpp | 19 +++++++++++++++++++
 stepmania/src/NoteData.h   |  1 +
 2 files changed, 20 insertions(+)

diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 063d8c0adf..b547a6ce0d 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -556,6 +556,7 @@ int NoteData::GetNumRowsWithSimultaneousTaps( int iMinTaps, int iStartIndex, int
 	return iNum;
 }
 
+// XXX: This shouldn't include rolls, but need to check how that would impact scoring ...
 int NoteData::GetNumHoldNotes( int iStartIndex, int iEndIndex ) const
 {
 	int iNumHolds = 0;
@@ -573,6 +574,24 @@ int NoteData::GetNumHoldNotes( int iStartIndex, int iEndIndex ) const
 	return iNumHolds;
 }
 
+int NoteData::GetNumRolls( int iStartIndex, int iEndIndex ) const
+{
+	int iNumRolls = 0;
+	for( int t=0; t<GetNumTracks(); ++t )
+	{
+		const_iterator begin, end;
+		GetTapNoteRangeExclusive( t, iStartIndex, iEndIndex, begin, end );
+		for( ; begin != end; ++begin )
+		{
+			if( begin->second.type != TapNote::hold_head ||
+				begin->second.subType != TapNote::hold_head_roll )
+				continue;
+			iNumRolls++;
+		}
+	}
+	return iNumRolls;
+}
+
 // -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 c1cfd4ba54..86ff8ad8fd 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -134,6 +134,7 @@ public:
 	int GetNumRowsWithTapOrHoldHead( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const;
 	/* optimization: for the default of start to end, use the second (faster) */
 	int GetNumHoldNotes( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const;
+	int GetNumRolls( int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const;
 
 	// Count rows that contain iMinTaps or more taps.
 	int GetNumRowsWithSimultaneousTaps( int iMinTaps, int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW ) const;