diff --git a/stepmania/src/LifeMeterBar.h b/stepmania/src/LifeMeterBar.h index 6afcddd586..651842225d 100644 --- a/stepmania/src/LifeMeterBar.h +++ b/stepmania/src/LifeMeterBar.h @@ -22,7 +22,6 @@ public: virtual void ChangeLife( HoldNoteScore score, TapNoteScore tscore ); virtual void ChangeLife( float fDeltaLifePercent ); virtual void AfterLifeChanged(); - virtual void OnDancePointsChange() {}; // this life meter doesn't care virtual bool IsInDanger() const; virtual bool IsPastPassmark() const; virtual bool IsHot() const; diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index afcdfc880f..c5c51695c0 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -138,11 +138,6 @@ void LifeMeterBattery::ChangeLife( float fDeltaLifePercent ) { } -void LifeMeterBattery::OnDancePointsChange() -{ -} - - bool LifeMeterBattery::IsInDanger() const { return false; diff --git a/stepmania/src/LifeMeterBattery.h b/stepmania/src/LifeMeterBattery.h index edc1bdc960..ce61795658 100644 --- a/stepmania/src/LifeMeterBattery.h +++ b/stepmania/src/LifeMeterBattery.h @@ -23,7 +23,6 @@ public: virtual void ChangeLife( TapNoteScore score ); virtual void ChangeLife( HoldNoteScore score, TapNoteScore tscore ); virtual void ChangeLife( float fDeltaLifePercent ); - virtual void OnDancePointsChange(); // look in GAMESTATE and update the display virtual bool IsInDanger() const; virtual bool IsHot() const; virtual bool IsFailing() const; diff --git a/stepmania/src/LifeMeterTime.cpp b/stepmania/src/LifeMeterTime.cpp index eb4121769c..ef3c860b6b 100644 --- a/stepmania/src/LifeMeterTime.cpp +++ b/stepmania/src/LifeMeterTime.cpp @@ -124,11 +124,6 @@ void LifeMeterTime::ChangeLife( HoldNoteScore hns, TapNoteScore tns ) m_pPlayerStageStats->bFailedEarlier = true; } -void LifeMeterTime::OnDancePointsChange() -{ -} - - bool LifeMeterTime::IsInDanger() const { return false; diff --git a/stepmania/src/LifeMeterTime.h b/stepmania/src/LifeMeterTime.h index 0706654212..07be6e5a5c 100644 --- a/stepmania/src/LifeMeterTime.h +++ b/stepmania/src/LifeMeterTime.h @@ -25,7 +25,6 @@ public: virtual void OnLoadSong(); virtual void ChangeLife( TapNoteScore score ); virtual void ChangeLife( HoldNoteScore score, TapNoteScore tscore ); - virtual void OnDancePointsChange(); // look in GAMESTATE and update the display virtual bool IsInDanger() const; virtual bool IsHot() const; virtual bool IsFailing() const; diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 9b8cca07ef..45d1813f08 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -1823,14 +1823,9 @@ void Player::HandleTapRowScore( unsigned row ) } if( m_pLifeMeter ) - { m_pLifeMeter->ChangeLife( scoreOfLastTap ); - m_pLifeMeter->OnDancePointsChange(); // update oni life meter - } if( m_pCombinedLifeMeter ) - { m_pCombinedLifeMeter->ChangeLife( pn, scoreOfLastTap ); - } } @@ -1871,14 +1866,9 @@ void Player::HandleHoldScore( const TapNote &tn ) } if( m_pLifeMeter ) - { m_pLifeMeter->ChangeLife( holdScore, tapScore ); - m_pLifeMeter->OnDancePointsChange(); - } if( m_pCombinedLifeMeter ) - { m_pCombinedLifeMeter->ChangeLife( pn, holdScore, tapScore ); - } } float Player::GetMaxStepDistanceSeconds()