From 400793d5a4c0c24a4857adce7548c3569c5291b6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 27 Sep 2003 03:54:31 +0000
Subject: [PATCH] Simplify.  Fix eval time display.

---
 stepmania/src/ScoreDisplayOni.cpp | 7 ++-----
 stepmania/src/ScreenGameplay.cpp  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/ScoreDisplayOni.cpp b/stepmania/src/ScoreDisplayOni.cpp
index b3aba95b5f..8c6d5b0af8 100644
--- a/stepmania/src/ScoreDisplayOni.cpp
+++ b/stepmania/src/ScoreDisplayOni.cpp
@@ -43,12 +43,9 @@ void ScoreDisplayOni::Update( float fDelta )
 {
 	ScoreDisplay::Update( fDelta );
 
-	float fSecsIntoPlay;
+	float fSecsIntoPlay = 0;
 	if( GAMESTATE->IsPlayerEnabled(m_PlayerNumber) )
-		// cure: multiplied by music rate to adjust timer
-		fSecsIntoPlay = GAMESTATE->m_CurStageStats.fAliveSeconds[m_PlayerNumber] * GAMESTATE->m_SongOptions.m_fMusicRate;
-	else
-		fSecsIntoPlay = 0;
+		fSecsIntoPlay = GAMESTATE->m_CurStageStats.fAliveSeconds[m_PlayerNumber];
 
 	m_text.SetText( SecondsToTime(fSecsIntoPlay) );
 }
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 2e9eaf4e13..14dd98a4b4 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1032,7 +1032,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 		//
 		for( pn=0; pn<NUM_PLAYERS; pn++ )
 			if( GAMESTATE->IsPlayerEnabled(pn) && !GAMESTATE->m_CurStageStats.bFailed[pn])
-				GAMESTATE->m_CurStageStats.fAliveSeconds [pn] += fDeltaTime;
+				GAMESTATE->m_CurStageStats.fAliveSeconds [pn] += fDeltaTime * GAMESTATE->m_SongOptions.m_fMusicRate;
 
 		//
 		// Check for end of song