From a757736b098ade9047fd144bb0364b7cab7d0e18 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 8 Apr 2005 00:53:17 +0000 Subject: [PATCH] fix comparison to FailType instead of LifeType --- stepmania/src/ScreenGameplay.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index effbba5736..5afde386f1 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1335,6 +1335,8 @@ void ScreenGameplay::Update( float fDeltaTime ) FOREACH_EnabledPlayer( pn ) { SongOptions::FailType ft = GAMESTATE->GetPlayerFailType(pn); + SongOptions::LifeType lt = GAMESTATE->m_SongOptions.m_LifeType; + if( ft == SongOptions::FAIL_OFF ) continue; @@ -1347,15 +1349,15 @@ void ScreenGameplay::Update( float fDeltaTime ) /* If recovery is enabled, only set fail if both are failing. * There's no way to recover mid-song in battery mode. */ - if( GAMESTATE->m_SongOptions.m_LifeType != SongOptions::LIFE_BATTERY && + if( lt != SongOptions::LIFE_BATTERY && PREFSMAN->m_bTwoPlayerRecovery && !GAMESTATE->AllAreDead() ) continue; LOG->Trace("Player %d failed", (int)pn); STATSMAN->m_CurStageStats.m_player[pn].bFailed = true; // fail - if( ft == SongOptions::LIFE_BATTERY && - ft == SongOptions::FAIL_IMMEDIATE ) + if( lt == SongOptions::LIFE_BATTERY && + ft == SongOptions::FAIL_IMMEDIATE ) { if( !STATSMAN->m_CurStageStats.AllFailedEarlier() ) // if not the last one to fail {