From 18a0c818cd3ee328b2e9cedce0723c2d577f2c72 Mon Sep 17 00:00:00 2001
From: "Ben \"root\" Anderson" <roothorick@gmail.com>
Date: Wed, 11 Dec 2013 18:19:19 -0600
Subject: [PATCH] Don't send HNS_Held / HNS_LetGo when using checkpoint holds

---
 src/Player.cpp | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/Player.cpp b/src/Player.cpp
index bf6a551277..6468ffbd64 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -1412,39 +1412,35 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
 			else
 				LOG->Trace("did not let go of hold note :D");
 			*/
-		}
 
-		if( bInitiatedNote )
-		{
-			if(!bLetGoOfHoldNote)
+			if( bInitiatedNote )
 			{
-				//LOG->Trace("initiated note and didn't let go");
-				fLife = 1; // xxx: should be MAX_HOLD_LIFE instead? -aj
-				hns = HNS_Held;
-				bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD;
-				if( m_pNoteField )
+				if(!bLetGoOfHoldNote)
 				{
-					FOREACH( TrackRowTapNote, vTN, trtn )
+					//LOG->Trace("initiated note and didn't let go");
+					fLife = 1; // xxx: should be MAX_HOLD_LIFE instead? -aj
+					hns = HNS_Held;
+					bool bBright = m_pPlayerStageStats && m_pPlayerStageStats->m_iCurCombo>(int)BRIGHT_GHOST_COMBO_THRESHOLD;
+					if( m_pNoteField )
 					{
-						int iTrack = trtn->iTrack;
-						m_pNoteField->DidHoldNote( iTrack, HNS_Held, bBright );	// bright ghost flash
+						FOREACH( TrackRowTapNote, vTN, trtn )
+						{
+							int iTrack = trtn->iTrack;
+							m_pNoteField->DidHoldNote( iTrack, HNS_Held, bBright );	// bright ghost flash
+						}
 					}
 				}
-			}
 
-			else
-			{
-				//LOG->Trace("initiated note and let go :(");
+				else
+				{
+					//LOG->Trace("initiated note and let go :(");
+				}
 			}
-		}
-		else if( SCORE_MISSED_HOLDS_AND_ROLLS )
-		{
-			hns = HNS_LetGo;
-		}
-		else 
-		{
-			hns = HNS_None;
-		}
+			else if( SCORE_MISSED_HOLDS_AND_ROLLS )
+			{
+				hns = HNS_LetGo;
+			}
+		} // hns == HNS_None initially and so it may remain
 	}
 
 	float fLifeFraction = fLife / MAX_HOLD_LIFE;