From e658c36944a6f200b42c4a076717deb9ad490e63 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 16 Sep 2003 01:13:49 +0000 Subject: [PATCH] Bring LIFE_BAR and LIFE_BATTERY code paths closer together. --- stepmania/src/ScreenGameplay.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 18c7ee7f18..4a8673ad79 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1173,15 +1173,14 @@ void ScreenGameplay::UpdateCheckFail() { if( !GAMESTATE->IsPlayerEnabled(pn) ) continue; + if( (m_pLifeMeter[pn] && !m_pLifeMeter[pn]->IsFailing()) || + (m_pCombinedLifeMeter && !m_pCombinedLifeMeter->IsFailing((PlayerNumber)pn)) ) + continue; /* isn't failing */ if( GAMESTATE->m_CurStageStats.bFailed[pn] ) continue; /* already failed */ - if( (m_pLifeMeter[pn] && m_pLifeMeter[pn]->IsFailing()) || - (m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsFailing((PlayerNumber)pn)) ) - { - LOG->Trace("Player %d failed", (int)pn); - GAMESTATE->m_CurStageStats.bFailed[pn] = true; // fail - } + LOG->Trace("Player %d failed", (int)pn); + GAMESTATE->m_CurStageStats.bFailed[pn] = true; // fail } break; case SongOptions::LIFE_BATTERY: