From 815f3d6dd55a8b14bc283a218e22439b92631747 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Nov 2006 06:03:18 +0000 Subject: [PATCH] remove unused CombinedLifeMeter::IsFailing. Nothing uses it, so 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. --- stepmania/src/CombinedLifeMeter.h | 1 - stepmania/src/CombinedLifeMeterTug.h | 1 - stepmania/src/ScreenGameplay.cpp | 6 +----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/stepmania/src/CombinedLifeMeter.h b/stepmania/src/CombinedLifeMeter.h index 05123de1b1..1b26561ccd 100644 --- a/stepmania/src/CombinedLifeMeter.h +++ b/stepmania/src/CombinedLifeMeter.h @@ -19,7 +19,6 @@ public: /* Change life after receiving a hold note grade. tscore is the score * received for the initial tap note. */ virtual void ChangeLife( PlayerNumber pn, HoldNoteScore hns, TapNoteScore tns ) = 0; - virtual bool IsFailing( PlayerNumber pn ) = 0; virtual void OnTaunt() {}; }; diff --git a/stepmania/src/CombinedLifeMeterTug.h b/stepmania/src/CombinedLifeMeterTug.h index 876fde57a5..a29ab3a01c 100644 --- a/stepmania/src/CombinedLifeMeterTug.h +++ b/stepmania/src/CombinedLifeMeterTug.h @@ -15,7 +15,6 @@ public: virtual void ChangeLife( PlayerNumber pn, TapNoteScore score ); virtual void ChangeLife( PlayerNumber pn, HoldNoteScore score, TapNoteScore tscore ); - virtual bool IsFailing( PlayerNumber pn ) { return false; }; protected: void ChangeLife( PlayerNumber pn, float fPercentToMove ); diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index ad81b8d67d..3b5df00182 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -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 */