From 7ca1ac3fffbaed92da1970d4559e9793e75ac479 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 27 Oct 2007 01:51:58 +0000
Subject: [PATCH] SurviveSeconds -> AliveSeconds

---
 stepmania/src/HighScore.cpp          | 2 +-
 stepmania/src/HighScore.h            | 2 +-
 stepmania/src/ScreenDebugOverlay.cpp | 2 +-
 stepmania/src/ScreenGameplay.cpp     | 6 +++---
 stepmania/src/StageStats.cpp         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/HighScore.cpp b/stepmania/src/HighScore.cpp
index 5601f008d3..1d45c3d8b6 100644
--- a/stepmania/src/HighScore.cpp
+++ b/stepmania/src/HighScore.cpp
@@ -175,7 +175,7 @@ void HighScore::SetName( const RString &sName ) { m_Impl->sName = sName; }
 void HighScore::SetGrade( Grade g ) { m_Impl->grade = g; }
 void HighScore::SetScore( int iScore ) { m_Impl->iScore = iScore; }
 void HighScore::SetPercentDP( float f ) { m_Impl->fPercentDP = f; }
-void HighScore::SetSurviveSeconds( float f ) { m_Impl->fSurviveSeconds = f; }
+void HighScore::SetAliveSeconds( float f ) { m_Impl->fSurviveSeconds = f; }
 void HighScore::SetModifiers( RString s ) { m_Impl->sModifiers = s; }
 void HighScore::SetDateTime( DateTime d ) { m_Impl->dateTime = d; }
 void HighScore::SetPlayerGuid( RString s ) { m_Impl->sPlayerGuid = s; }
diff --git a/stepmania/src/HighScore.h b/stepmania/src/HighScore.h
index ca4dec1e52..78d963ae2d 100644
--- a/stepmania/src/HighScore.h
+++ b/stepmania/src/HighScore.h
@@ -37,7 +37,7 @@ struct HighScore
 	void SetGrade( Grade g );
 	void SetScore( int iScore );
 	void SetPercentDP( float f );
-	void SetSurviveSeconds( float f );
+	void SetAliveSeconds( float f );
 	void SetModifiers( RString s );
 	void SetDateTime( DateTime d );
 	void SetPlayerGuid( RString s );
diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp
index fe7411781b..63550e7769 100644
--- a/stepmania/src/ScreenDebugOverlay.cpp
+++ b/stepmania/src/ScreenDebugOverlay.cpp
@@ -797,7 +797,7 @@ static HighScore MakeRandomHighScore( float fPercentDP )
 	hs.SetGrade( g );
 	hs.SetScore( RandomInt(100*1000) );
 	hs.SetPercentDP( fPercentDP );
-	hs.SetSurviveSeconds( randomf(30.0f, 100.0f) );
+	hs.SetAliveSeconds( randomf(30.0f, 100.0f) );
 	PlayerOptions po;
 	po.ChooseRandomModifiers();
 	hs.SetModifiers( po.GetString() );
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 924b06f9e9..c6da105c3c 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2583,10 +2583,10 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		// show the survive time if extra stage
 		if( GAMESTATE->IsAnExtraStage() )
 		{
-			float fMaxSurviveSeconds = 0;
+			float fMaxAliveSeconds = 0;
 			FOREACH_EnabledPlayer(p)
-				fMaxSurviveSeconds = max( fMaxSurviveSeconds, STATSMAN->m_CurStageStats.m_player[p].m_fAliveSeconds );
-			m_textSurviveTime.SetText( "TIME: " + SecondsToMMSSMsMs(fMaxSurviveSeconds) );
+				fMaxAliveSeconds = max( fMaxAliveSeconds, STATSMAN->m_CurStageStats.m_player[p].m_fAliveSeconds );
+			m_textSurviveTime.SetText( "TIME: " + SecondsToMMSSMsMs(fMaxAliveSeconds) );
 			ON_COMMAND( m_textSurviveTime );
 		}
 		
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index bf737a6aa0..2f42513fa8 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -167,7 +167,7 @@ void StageStats::CommitScores( bool bSummary )
 		hs.SetGrade( m_player[p].GetGrade() );
 		hs.SetScore( m_player[p].m_iScore );
 		hs.SetPercentDP( m_player[p].GetPercentDancePoints() );
-		hs.SetSurviveSeconds( m_player[p].m_fAliveSeconds );
+		hs.SetAliveSeconds( m_player[p].m_fAliveSeconds );
 
 		vector<RString> asModifiers;
 		{