From 2d8f1307716e2548b1626cb1c731c3a2769c1a4a Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sat, 9 Jul 2011 13:21:08 -0400
Subject: [PATCH] Revert these. It was only needed in score.

I apologize for the recompilation of about 180 files.
---
 src/NoteTypes.h | 14 ++------------
 src/Player.cpp  | 41 +++--------------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/src/NoteTypes.h b/src/NoteTypes.h
index 26955ee6cd..795eef7131 100644
--- a/src/NoteTypes.h
+++ b/src/NoteTypes.h
@@ -13,8 +13,7 @@ class XNode;
 struct TapNoteResult
 {
 	/** @brief Set up the TapNoteResult with default values. */
-	TapNoteResult() : tns(TNS_None), fTapNoteOffset(0.f),
-		bHidden(false), numJudgments(1) { }
+	TapNoteResult() : tns(TNS_None), fTapNoteOffset(0.f), bHidden(false) { }
 	/** @brief The TapNoteScore that was achieved by the player. */
 	TapNoteScore	tns;
 
@@ -28,12 +27,6 @@ struct TapNoteResult
 
 	/** @brief If the whole row has been judged, all taps on the row will be set to hidden. */
 	bool		bHidden;
-	
-	/**
-	 * @brief How many judgments is this really worth?
-	 *
-	 * This is based off of the Combo Segment value. */
-	int numJudgments;
 
 	// XML
 	XNode* CreateNode() const;
@@ -42,10 +35,7 @@ struct TapNoteResult
 /** @brief The result of holding (or letting go of) a hold note. */
 struct HoldNoteResult
 {
-	HoldNoteResult(): hns(HNS_None), fLife(1.f),
-		fOverlappedTime(0), iLastHeldRow(0),
-		iCheckpointsHit(0), iCheckpointsMissed(0),
-		bHeld(false), bActive(false) { }
+	HoldNoteResult() : hns(HNS_None), fLife(1.f), fOverlappedTime(0), iLastHeldRow(0), iCheckpointsHit(0), iCheckpointsMissed(0), bHeld(false), bActive(false) { }
 	float GetLastHeldBeat() const;
 
 	HoldNoteScore	hns;
diff --git a/src/Player.cpp b/src/Player.cpp
index 9b34efbe1b..5dfed3e310 100644
--- a/src/Player.cpp
+++ b/src/Player.cpp
@@ -201,9 +201,6 @@ ThemeMetric<int> COMBO_STOPPED_AT ( "Player", "ComboStoppedAt" );
 ThemeMetric<float> ATTACK_RUN_TIME_RANDOM ( "Player", "AttackRunTimeRandom" );
 ThemeMetric<float> ATTACK_RUN_TIME_MINE ( "Player", "AttackRunTimeMine" );
 
-ThemeMetric<TapNoteScore> MIN_SCORE_TO_CONTINUE_COMBO ("Gameplay", "MinScoreToContinueCombo");
-ThemeMetric<TapNoteScore> MIN_SCORE_TO_MAINTAIN_COMBO ("Gameplay", "MinScoreToMaintainCombo");
-
 /**
  * @brief What is our highest cap for mMods?
  *
@@ -2497,8 +2494,6 @@ done_checking_hopo:
 
 		if( score != TNS_None )
 		{
-			ComboSegment &cs = m_Timing->GetComboSegmentAtRow(row);
-			
 			switch( pbt )
 			{
 			DEFAULT_FAIL(pbt);
@@ -2510,45 +2505,15 @@ done_checking_hopo:
 					{
 						tn.result.tns = score;
 						tn.result.fTapNoteOffset = -fNoteOffset;
-						
-						if (score > MIN_SCORE_TO_CONTINUE_COMBO)
-						{
-							tn.result.numJudgments = cs.GetCombo();
-						}
-						else if (score < MIN_SCORE_TO_MAINTAIN_COMBO)
-						{
-							tn.result.numJudgments = cs.GetMissCombo();
-						}
-						else
-						{
-							tn.result.numJudgments = 1; // sanity check
-						}
-						
 						m_NoteData.SetTapNote( t, iRowOfOverlappingNoteOrRow, tn );
 					}
 				}
 				break;
 			case ButtonType_Hopo:
 			case ButtonType_Step:
-				{
-					pTN->result.tns = score;
-					pTN->result.fTapNoteOffset = -fNoteOffset;
-						
-					if (score > MIN_SCORE_TO_CONTINUE_COMBO)
-					{
-						pTN->result.numJudgments = cs.GetCombo();
-					}
-					else if (score < MIN_SCORE_TO_MAINTAIN_COMBO)
-					{
-						pTN->result.numJudgments = cs.GetMissCombo();
-					}
-					else
-					{
-						pTN->result.numJudgments = 1; // sanity check
-					}
-						
-					break;
-				}
+				pTN->result.tns = score;
+				pTN->result.fTapNoteOffset = -fNoteOffset;
+				break;
 			}
 		}