From 9a0457a84b203cc107c969a44b2ef56aec86c0ae Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 9 Nov 2006 04:47:33 +0000
Subject: [PATCH] simplify

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

diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp
index 572857afff..afcdfc880f 100644
--- a/stepmania/src/LifeMeterBattery.cpp
+++ b/stepmania/src/LifeMeterBattery.cpp
@@ -64,7 +64,7 @@ void LifeMeterBattery::Load( const PlayerState *pPlayerState, PlayerStageStats *
 
 void LifeMeterBattery::OnSongEnded()
 {
-	if( m_pPlayerStageStats->bFailedEarlier )
+	if( m_pPlayerStageStats->bFailed || m_pPlayerStageStats->bFailedEarlier )
 		return;
 
 	if( m_iLivesLeft < GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives )
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 6cc990df9f..34df374359 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2449,11 +2449,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		// give a little life back between stages
 		FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
 		{
-			if( !pi->GetPlayerStageStats()->bFailed )
-			{
-				if( pi->m_pLifeMeter )
-					pi->m_pLifeMeter->OnSongEnded();	
-			}
+			if( pi->m_pLifeMeter )
+				pi->m_pLifeMeter->OnSongEnded();	
 		}
 
 		GAMESTATE->m_bLoadingNextSong = true;