actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bring LIFE_BAR and LIFE_BATTERY code paths closer together.

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-16 01:13:49 +00:00
parent 519d6c80b6
commit e658c36944
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+5 -6
View File
@@ -1173,15 +1173,14 @@ void ScreenGameplay::UpdateCheckFail()
{ {
if( !GAMESTATE->IsPlayerEnabled(pn) ) if( !GAMESTATE->IsPlayerEnabled(pn) )
continue; 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] ) if( GAMESTATE->m_CurStageStats.bFailed[pn] )
continue; /* already failed */ continue; /* already failed */
if( (m_pLifeMeter[pn] && m_pLifeMeter[pn]->IsFailing()) || LOG->Trace("Player %d failed", (int)pn);
(m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsFailing((PlayerNumber)pn)) ) GAMESTATE->m_CurStageStats.bFailed[pn] = true; // fail
{
LOG->Trace("Player %d failed", (int)pn);
GAMESTATE->m_CurStageStats.bFailed[pn] = true; // fail
}
} }
break; break;
case SongOptions::LIFE_BATTERY: case SongOptions::LIFE_BATTERY: