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

remove unused CombinedLifeMeter::IsFailing. Nothing uses it, so

Browse Source 
it probably doesn't work.  Maybe a cleaner way if this is needed would
be to have a stub regular LifeMeter that points to CombinedLifeMeter, so
we don't need repetitive logic.
This commit is contained in:
Glenn Maynard
2006-11-09 06:03:18 +00:00
parent 0589d3f72a
commit 815f3d6dd5
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+1 -5
View File
@@ -1564,9 +1564,7 @@ void ScreenGameplay::Update( float fDeltaTime )
{
PlayerNumber pn = pi->GetStepsAndTrailIndex();
if(
(pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) ||
(m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsFailing(pn)) )
if( pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing() )
{
pi->GetPlayerState()->m_HealthState = PlayerState::DEAD;
}
@@ -1603,8 +1601,6 @@ void ScreenGameplay::Update( float fDeltaTime )
// check for individual fail
if( pi->m_pLifeMeter == NULL || !pi->m_pLifeMeter->IsFailing() )
continue; /* isn't failing */
if( m_pCombinedLifeMeter && !m_pCombinedLifeMeter->IsFailing(pn) )
continue; /* isn't failing */
if( pi->GetPlayerStageStats()->bFailed )
continue; /* failed and is already dead */