From d5d1ea5ca4a17a57f469e5e71a39dc3392d774ea Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 31 Dec 2003 20:58:14 +0000
Subject: [PATCH] move AllFailedEarlier into StageStats

---
 stepmania/src/ScreenGameplay.cpp | 10 +---------
 stepmania/src/ScreenGameplay.h   |  1 -
 stepmania/src/StageStats.cpp     |  8 ++++++++
 stepmania/src/StageStats.h       |  1 +
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 3457caf6a0..0f251e5803 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1013,14 +1013,6 @@ float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusi
 	return fFirstSecond - fStartSecond;
 }
 
-bool ScreenGameplay::AllFailedEarlier() const
-{
-	for( int p=0; p<NUM_PLAYERS; p++ )
-		if( GAMESTATE->IsPlayerEnabled(p) && !g_CurStageStats.bFailedEarlier[p] )
-			return false;
-	return true;
-}
-
 // play assist ticks
 bool ScreenGameplay::IsTimeToPlayTicks() const
 {
@@ -1380,7 +1372,7 @@ void ScreenGameplay::UpdateCheckFail()
 		if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY &&
 			GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_ARCADE )
 		{
-			if( !AllFailedEarlier() )	// if not the last one to fail
+			if( !g_CurStageStats.AllFailedEarlier() )	// if not the last one to fail
 			{
 				// kill them!
 				m_soundOniDie.PlayRandom();
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index 7d9fc76ce6..5b402479ae 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -78,7 +78,6 @@ protected:
 	float StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic);
 	void ShowSavePrompt( ScreenMessage SM_SendWhenDone );
 
-	bool AllFailedEarlier() const;
 	bool IsTimeToPlayTicks() const;
 	void UpdateLyrics( float fDeltaTime );
 	void UpdateCheckFail();
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index f0760be7f3..a79848ed64 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -224,6 +224,14 @@ bool StageStats::AllFailed() const
 	return true;
 }
 
+bool StageStats::AllFailedEarlier() const
+{
+	for( int p=0; p<NUM_PLAYERS; p++ )
+		if( GAMESTATE->IsPlayerEnabled(p) && !bFailedEarlier[p] )
+			return false;
+	return true;
+}
+
 float StageStats::GetPercentDancePoints( PlayerNumber pn ) const
 {
 	if( iPossibleDancePoints[pn] == 0 )
diff --git a/stepmania/src/StageStats.h b/stepmania/src/StageStats.h
index bfe34d9866..ee9b1f28c7 100644
--- a/stepmania/src/StageStats.h
+++ b/stepmania/src/StageStats.h
@@ -28,6 +28,7 @@ struct StageStats
 	Grade GetGrade( PlayerNumber pn ) const;
 	bool OnePassed() const;
 	bool AllFailed() const;
+	bool AllFailedEarlier() const;
 	float GetPercentDancePoints( PlayerNumber pn ) const;
 
 	PlayMode	playMode;