From 08bfaf532f85068977191d4aaf4de28bd7f155ed Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 20 Aug 2002 21:19:49 +0000
Subject: [PATCH] Fix announcer repeating when you get a 100*n combo and break
 it at the 100*n+1st step.

---
 stepmania/src/Combo.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/Combo.cpp b/stepmania/src/Combo.cpp
index 3c68df836c..df3a5aaa10 100644
--- a/stepmania/src/Combo.cpp
+++ b/stepmania/src/Combo.cpp
@@ -45,10 +45,10 @@ void Combo::ContinueCombo()
 {
 	m_iCurCombo++;
 
-	// new max combo
-	if( m_iCurCombo > m_iMaxCombo )
-		m_iMaxCombo = m_iCurCombo;
+	/* If needed, make this a theme metric. */
+	const bool HighComboAlert_OnceOnly = true;
 
+	if(!HighComboAlert_OnceOnly || m_iCurCombo > m_iMaxCombo)
 	switch( m_iCurCombo )
 	{
 	case 100: 		SCREENMAN->SendMessageToTopScreen( SM_100Combo, 0 );	break;
@@ -63,6 +63,8 @@ void Combo::ContinueCombo()
 	case 1000: 		SCREENMAN->SendMessageToTopScreen( SM_1000Combo, 0 );	break;
 	}
 
+	// new max combo
+	m_iMaxCombo = max(m_iMaxCombo, m_iCurCombo);
 
 	if( m_iCurCombo <= 4 )
 	{