From b0496fbcb6ec130647aa524debebb60c92f81d90 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Sun, 23 Jul 2006 21:35:41 +0000
Subject: [PATCH] Split out HideNote. Make fewer copies of TapNotes.

---
 stepmania/src/Player.cpp | 21 ++++-----------------
 stepmania/src/Player.h   |  6 ++++++
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index d127ad0fd1..38af7eeac2 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -1209,12 +1209,9 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
 			// remove all TapAttacks on this row
 			for( int t=0; t<m_NoteData.GetNumTracks(); t++ )
 			{
-				TapNote tn = m_NoteData.GetTapNote(t, iIndexOverlappingNote);
+				const TapNote &tn = m_NoteData.GetTapNote(t, iIndexOverlappingNote);
 				if( tn.type == TapNote::attack )
-				{
-					tn.result.bHidden = true;
-					m_NoteData.SetTapNote( col, iIndexOverlappingNote, tn );
-				}
+					HideNote( t, iIndexOverlappingNote );
 			}
 		}
 
@@ -1245,12 +1242,7 @@ void Player::HandleStep( int col, const RageTimer &tm, bool bHeld )
 				if( m_pNoteField )
 					m_pNoteField->DidTapNote( col, score, bBright );
 				if( score >= TNS_W3 || bBlind )
-				{
-					TapNote tn2 = tn;
-					
-					tn2.result.bHidden = true;
-					m_NoteData.SetTapNote( col, iIndexOverlappingNote, tn2 );
-				}
+					HideNote( col, iIndexOverlappingNote );
 			}
 		}
 		else if( NoteDataWithScoring::IsRowCompletelyJudged(m_NoteData, iIndexOverlappingNote, pn) )
@@ -1452,12 +1444,7 @@ void Player::FlashGhostRow( int iRow, PlayerNumber pn )
 		if( m_pNoteField )
 			m_pNoteField->DidTapNote( iTrack, lastTNS, bBright );
 		if( lastTNS >= TNS_W3 || bBlind )
-		{
-			TapNote tn2 = tn;
-			
-			tn2.result.bHidden = true;
-			m_NoteData.SetTapNote( iTrack, iRow, tn2 );
-		}
+			HideNote( iTrack, iRow );
 	}
 }
 
diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h
index 08b4f0e5c9..5dbfac5b24 100644
--- a/stepmania/src/Player.h
+++ b/stepmania/src/Player.h
@@ -139,6 +139,12 @@ protected:
 	int GetClosestNote( int col, int iNoteRow, int iMaxRowsAhead, int iMaxRowsBehind, bool bAllowGraded ) const;
 
 	bool IsPlayingBeginner() const;
+	inline void HideNote( int col, int row )
+	{
+		NoteData::iterator iter = m_NoteData.FindTapNote( col, row );
+		if( iter != m_NoteData.end(col) )
+			iter->second.result.bHidden = true;
+	}
 
 	bool			m_bLoaded;