From 4a3a87e25b9b84c178f78b3fa6e925da906892e2 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 9 May 2005 02:22:54 +0000
Subject: [PATCH] slightly smaller boo and miss window with merciful beginner

---
 stepmania/src/Player.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 7c3492c33d..4ac0d1a0c2 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -51,7 +51,7 @@ static const float StepSearchDistance = 1.0f;
 
 #define ADJUSTED_WINDOW_TAP( judge, tns ) ( \
 	ADJUSTED_WINDOW_HOLD( judge ) + \
-	((PREFSMAN->m_bMercifulBeginner && (tns==TNS_MISS||tns==TNS_BOO) && IsPlayingBeginner()) ? 0.5f : 0) )
+	((PREFSMAN->m_bMercifulBeginner && (tns==TNS_MISS||tns==TNS_BOO) && IsPlayingBeginner()) ? 0.25f : 0) )
 
 Player::Player()
 {
@@ -1610,6 +1610,9 @@ void Player::FadeToFail()
 {
 	if( m_pNoteField )
 		m_pNoteField->FadeToFail();
+
+	// clear miss combo
+	m_Combo.SetCombo( 0, 0 );
 }
 
 bool Player::IsPlayingBeginner() const