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

This reverts commit 18a0c818cd3ee328b2e9cedce0723c2d577f2c72.

Those events are used for more than just life and scoring.
---
 src/Player.cpp | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

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