actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/CombinedLifeMeter.h
-1
View File
@@ -19,7 +19,6 @@ public:
/* Change life after receiving a hold note grade. tscore is the score /* Change life after receiving a hold note grade. tscore is the score
* received for the initial tap note. */ * received for the initial tap note. */
virtual void ChangeLife( PlayerNumber pn, HoldNoteScore hns, TapNoteScore tns ) = 0; virtual void ChangeLife( PlayerNumber pn, HoldNoteScore hns, TapNoteScore tns ) = 0;
virtual bool IsFailing( PlayerNumber pn ) = 0;
virtual void OnTaunt() {}; virtual void OnTaunt() {};
}; };
stepmania/src/CombinedLifeMeterTug.h
-1
View File
@@ -15,7 +15,6 @@ public:
virtual void ChangeLife( PlayerNumber pn, TapNoteScore score ); virtual void ChangeLife( PlayerNumber pn, TapNoteScore score );
virtual void ChangeLife( PlayerNumber pn, HoldNoteScore score, TapNoteScore tscore ); virtual void ChangeLife( PlayerNumber pn, HoldNoteScore score, TapNoteScore tscore );
virtual bool IsFailing( PlayerNumber pn ) { return false; };
protected: protected:
void ChangeLife( PlayerNumber pn, float fPercentToMove ); void ChangeLife( PlayerNumber pn, float fPercentToMove );
stepmania/src/ScreenGameplay.cpp
+1 -5
View File
@@ -1564,9 +1564,7 @@ void ScreenGameplay::Update( float fDeltaTime )
{ {
PlayerNumber pn = pi->GetStepsAndTrailIndex(); PlayerNumber pn = pi->GetStepsAndTrailIndex();
if( if( pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing() )
(pi->m_pLifeMeter && pi->m_pLifeMeter->IsFailing()) ||
(m_pCombinedLifeMeter && m_pCombinedLifeMeter->IsFailing(pn)) )
{ {
pi->GetPlayerState()->m_HealthState = PlayerState::DEAD; pi->GetPlayerState()->m_HealthState = PlayerState::DEAD;
} }
@@ -1603,8 +1601,6 @@ void ScreenGameplay::Update( float fDeltaTime )
// check for individual fail // check for individual fail
if( pi->m_pLifeMeter == NULL || !pi->m_pLifeMeter->IsFailing() ) if( pi->m_pLifeMeter == NULL || !pi->m_pLifeMeter->IsFailing() )
continue; /* isn't failing */ continue; /* isn't failing */
if( m_pCombinedLifeMeter && !m_pCombinedLifeMeter->IsFailing(pn) )
continue; /* isn't failing */
if( pi->GetPlayerStageStats()->bFailed ) if( pi->GetPlayerStageStats()->bFailed )
continue; /* failed and is already dead */ continue; /* failed and is already dead */