From 9ed7cf25f352c8eb4547006239c9c153fbd2a3d7 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 25 Apr 2007 16:39:03 +0000
Subject: [PATCH] move AllHumanHaveComboOf30OrMoreMisses into StageStats

---
 stepmania/src/GameState.cpp      | 8 --------
 stepmania/src/GameState.h        | 1 -
 stepmania/src/ScreenGameplay.cpp | 5 +++--
 stepmania/src/StageStats.cpp     | 8 ++++++++
 stepmania/src/StageStats.h       | 1 +
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 276c48bb6d..2895113638 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1684,14 +1684,6 @@ bool GameState::AllAreInDangerOrWorse() const
 	return true;
 }
 
-bool GameState::AllHumanHaveComboOf30OrMoreMisses() const
-{
-	FOREACH_HumanPlayer( p )
-		if( STATSMAN->m_CurStageStats.m_player[p].m_iCurMissCombo < 30 )
-			return false;
-	return true;
-}
-
 bool GameState::OneIsHot() const
 {
 	FOREACH_EnabledPlayer( p )
diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h
index daa8776a6d..486beaa3ee 100644
--- a/stepmania/src/GameState.h
+++ b/stepmania/src/GameState.h
@@ -191,7 +191,6 @@ public:
 	float GetSongPercent( float beat ) const;
 
 	bool AllAreInDangerOrWorse() const;
-	bool AllHumanHaveComboOf30OrMoreMisses() const;
 	bool OneIsHot() const;
 
 	// used in PLAY_MODE_BATTLE
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index f4f85bd121..654845abad 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1723,14 +1723,15 @@ void ScreenGameplay::Update( float fDeltaTime )
 	// update give up
 	//
 	bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f;
-	if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && GAMESTATE->AllHumanHaveComboOf30OrMoreMisses()) )
+	bool bAllHumanHaveComboOf30OrMoreMisses = STATSMAN->m_CurStageStats.AllHumanHaveComboOf30OrMoreMisses();
+	if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && bAllHumanHaveComboOf30OrMoreMisses) )
 	{
 		// Give up
 
 		STATSMAN->m_CurStageStats.m_bGaveUp = true;
 		FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )
 		{
-			pi->GetPlayerStageStats()->m_bFailed |= GAMESTATE->AllHumanHaveComboOf30OrMoreMisses();
+			pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveComboOf30OrMoreMisses;
 		}
 
 		AbortGiveUp( false );
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index 6ba59737e2..0fd68833f0 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -311,6 +311,14 @@ bool StageStats::PlayerHasHighScore( PlayerNumber pn ) const
 	return false;
 }
 
+bool StageStats::AllHumanHaveComboOf30OrMoreMisses() const
+{
+	FOREACH_HumanPlayer( p )
+		if( m_player[p].m_iCurMissCombo < 30 )
+			return false;
+	return true;
+}
+
 // lua start
 #include "LuaBinding.h"
 
diff --git a/stepmania/src/StageStats.h b/stepmania/src/StageStats.h
index 532eca5e70..acccda8e80 100644
--- a/stepmania/src/StageStats.h
+++ b/stepmania/src/StageStats.h
@@ -52,6 +52,7 @@ public:
 
 	void CommitScores( bool bSummary );
 	bool PlayerHasHighScore( PlayerNumber pn ) const;
+	bool AllHumanHaveComboOf30OrMoreMisses() const;
 
 	// Lua
 	void PushSelf( lua_State *L );