From 8d396834dc4d9690a66a2e4d88bfd1cd8a692af2 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 25 Apr 2007 03:38:40 +0000
Subject: [PATCH] remove m_bComboContinuesBetweenSongs

---
 stepmania/src/GameState.cpp    | 17 -----------------
 stepmania/src/PrefsManager.cpp |  1 -
 stepmania/src/PrefsManager.h   |  1 -
 stepmania/src/StatsManager.cpp |  5 +----
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 9363f09599..2560f8147d 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -789,24 +789,7 @@ void GameState::ResetMusicStatistics()
 
 void GameState::ResetStageStatistics()
 {
-	StageStats OldStats = STATSMAN->m_CurStageStats;
 	STATSMAN->m_CurStageStats = StageStats();
-	if( PREFSMAN->m_bComboContinuesBetweenSongs )
-	{
-		FOREACH_PlayerNumber( p )
-		{
-			bool bFirstSong = m_iPlayerCurrentStageIndexForCurrentCredit[p] == 0;
-			if( bFirstSong )
-			{
-				Profile* pProfile = PROFILEMAN->GetProfile(p);
-				STATSMAN->m_CurStageStats.m_player[p].m_iCurCombo = pProfile->m_iCurrentCombo;
-			}
-			else
-			{
-				STATSMAN->m_CurStageStats.m_player[p].m_iCurCombo = OldStats.m_player[p].m_iCurCombo;
-			}
-		}
-	}
 
 	RemoveAllActiveAttacks();
 	FOREACH_PlayerNumber( p )
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index a73f24e2ba..8795690355 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -189,7 +189,6 @@ PrefsManager::PrefsManager() :
 	m_iCoinsPerCredit		( "CoinsPerCredit",		1 ),
 	m_iSongsPerPlay			( "SongsPerPlay",		3, ValidateSongsPerPlay ),
 	m_bDelayedCreditsReconcile	( "DelayedCreditsReconcile",	false ),
-	m_bComboContinuesBetweenSongs	( "ComboContinuesBetweenSongs",	false ),
 	m_ShowSongOptions		( "ShowSongOptions",		Maybe_YES ),
 	m_bDancePointsForOni		( "DancePointsForOni",		false ),
 	m_bPercentageScoring		( "PercentageScoring",		false ),
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 1f7ca85f47..dbe31ff851 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -151,7 +151,6 @@ public:
 	Preference<int>		m_iCoinsPerCredit;
 	Preference<int>		m_iSongsPerPlay;
 	Preference<bool>	m_bDelayedCreditsReconcile;
-	Preference<bool>	m_bComboContinuesBetweenSongs;
 	Preference<Maybe>		m_ShowSongOptions;
 	Preference<bool>	m_bDancePointsForOni;
 	Preference<bool>	m_bPercentageScoring;
diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp
index 7bfac7a42f..0b63688620 100644
--- a/stepmania/src/StatsManager.cpp
+++ b/stepmania/src/StatsManager.cpp
@@ -194,10 +194,7 @@ void StatsManager::CommitStatsToProfiles()
 		if( pPlayerProfile )
 		{
 			pPlayerProfile->m_iTotalGameplaySeconds += iGameplaySeconds;
-			pPlayerProfile->m_iCurrentCombo = 
-				PREFSMAN->m_bComboContinuesBetweenSongs ? 
-				m_CurStageStats.m_player[pn].m_iCurCombo : 
-				0;
+			pPlayerProfile->m_iCurrentCombo = 0;
 			pPlayerProfile->m_iNumTotalSongsPlayed += m_CurStageStats.m_vpPlayedSongs.size();
 		}