From cb10e7ece26eca0c21bf5a11010f1228948787b5 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 17 Dec 2002 23:31:35 +0000
Subject: [PATCH] remove note capping in scoring data

---
 stepmania/src/NoteDataWithScoring.cpp | 22 ++++++++++++----------
 stepmania/src/NoteDataWithScoring.h   |  2 +-
 stepmania/src/Player.cpp              |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index ad83e1f71c..efc7be7927 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -24,8 +24,10 @@ void NoteDataWithScoring::Init(int taps, int holds)
 	NoteData::Init();
 
 	for( int t=0; t<MAX_NOTE_TRACKS; t++ )
-		for( int i=0; i<MAX_TAP_NOTE_ROWS; i++ )
-			m_TapNoteScores[t][i] = TNS_NONE;
+	{
+		m_TapNoteScores[t].clear();
+		m_TapNoteScores[t].insert(m_TapNoteScores[t].begin(), taps, TNS_NONE);
+	}
 
 	m_HoldNoteScores.clear();
 	m_HoldNoteScores.insert(m_HoldNoteScores.begin(), holds, HNS_NONE);
@@ -35,14 +37,14 @@ void NoteDataWithScoring::Init(int taps, int holds)
 	m_fHoldNoteLife.insert(m_fHoldNoteLife.begin(), holds, 1.0f);
 }
 
-int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, const float fEndBeat )			
+int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, const float fEndBeat )
 { 
 	int iNumSuccessfulTapNotes = 0;
 
-	int iStartIndex = BeatToNoteRow( fStartBeat );
-	int iEndIndex = BeatToNoteRow( fEndBeat );
+	unsigned iStartIndex = BeatToNoteRow( fStartBeat );
+	unsigned iEndIndex = BeatToNoteRow( fEndBeat );
 
-	for( int i=iStartIndex; i<min(iEndIndex, MAX_TAP_NOTE_ROWS); i++ )
+	for( unsigned i=iStartIndex; i<min(iEndIndex, m_TapNoteScores[0].size()); i++ )
 	{
 		for( int t=0; t<m_iNumTracks; t++ )
 		{
@@ -58,10 +60,10 @@ int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float f
 {
 	int iNumSuccessfulDoubles = 0;
 
-	int iStartIndex = BeatToNoteRow( fStartBeat );
-	int iEndIndex = BeatToNoteRow( fEndBeat );
+	unsigned iStartIndex = BeatToNoteRow( fStartBeat );
+	unsigned iEndIndex = BeatToNoteRow( fEndBeat );
 
-	for( int i=iStartIndex; i<min(iEndIndex, MAX_TAP_NOTE_ROWS); i++ )
+	for( unsigned i=iStartIndex; i<min(iEndIndex, m_TapNoteScores[0].size()); i++ )
 	{
 		int iNumNotesThisIndex = 0;
 		TapNoteScore	minTapNoteScore = TNS_PERFECT;
@@ -160,7 +162,7 @@ float NoteDataWithScoring::GetActualChaosRadarValue( float fSongSeconds )
 {
 	// count number of triplets
 	int iNumChaosNotesCompleted = 0;
-	for( int r=0; r<MAX_TAP_NOTE_ROWS; r++ )
+	for( unsigned r=0; r<m_TapNoteScores[0].size(); r++ )
 	{
 		if( !IsRowEmpty(r)  &&  IsRowComplete(r)  &&  GetNoteType(r) >= NOTE_TYPE_12TH )
 			iNumChaosNotesCompleted++;
diff --git a/stepmania/src/NoteDataWithScoring.h b/stepmania/src/NoteDataWithScoring.h
index 1f526ac106..9844d2bf9f 100644
--- a/stepmania/src/NoteDataWithScoring.h
+++ b/stepmania/src/NoteDataWithScoring.h
@@ -17,7 +17,7 @@
 class NoteDataWithScoring : public NoteData
 {
 	// maintain this extra data in addition to the NoteData
-	TapNoteScore	m_TapNoteScores[MAX_NOTE_TRACKS][MAX_TAP_NOTE_ROWS];
+	vector<TapNoteScore> m_TapNoteScores[MAX_NOTE_TRACKS];
 
 	vector<HoldNoteScore> m_HoldNoteScores;
 
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 2b346601b4..c74428a57e 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -125,7 +125,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
 	const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
 
 	// init scoring
-	NoteDataWithScoring::Init(pNoteData->GetNumTapNotes(), pNoteData->GetNumHoldNotes());
+	NoteDataWithScoring::Init(pNoteData->GetLastRow(), pNoteData->GetNumHoldNotes());
 
 	// copy note data
 	this->CopyAll( pNoteData );