From 7ff9a6d38158bf147ec14bcac236e664c7c6e121 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 1 Dec 2003 21:12:07 +0000 Subject: [PATCH] no TwoPlayerRecovery in Oni --- stepmania/src/ScreenGameplay.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 0a3a5d5128..db15cbb10e 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1300,8 +1300,10 @@ void ScreenGameplay::UpdateCheckFail() if( GAMESTATE->m_CurStageStats.bFailed[pn] ) continue; /* failed and is already dead */ - /* If recovery is enabled, only set fail if both are failing. */ - if( PREFSMAN->m_bTwoPlayerRecovery && !AllAreFailing() ) + /* 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 && + PREFSMAN->m_bTwoPlayerRecovery && !AllAreFailing() ) continue; LOG->Trace("Player %d failed", (int)pn);