From 280d09bc2e0bf19729a090755b7ce3bee65c3365 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Nov 2006 04:17:16 +0000 Subject: [PATCH] remove never used ForceFail --- stepmania/src/LifeMeter.h | 1 - stepmania/src/LifeMeterBar.cpp | 7 ------- stepmania/src/LifeMeterBar.h | 1 - stepmania/src/LifeMeterBattery.cpp | 6 ------ stepmania/src/LifeMeterBattery.h | 1 - stepmania/src/LifeMeterTime.cpp | 5 ----- stepmania/src/LifeMeterTime.h | 1 - 7 files changed, 22 deletions(-) diff --git a/stepmania/src/LifeMeter.h b/stepmania/src/LifeMeter.h index 9cda1d4704..75bffd69db 100644 --- a/stepmania/src/LifeMeter.h +++ b/stepmania/src/LifeMeter.h @@ -34,7 +34,6 @@ public: virtual bool IsFailing() const = 0; virtual float GetLife() const { return 0; } // for cosmetic use only virtual void UpdateNonstopLifebar(int cleared, int total, int ProgressiveLifebarDifficulty) = 0; - virtual void ForceFail() = 0; static LifeMeter *MakeLifeMeter( SongOptions::LifeType t ); diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 24888148c2..d900458a5f 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -421,13 +421,6 @@ void LifeMeterBar::FillForHowToPlay( int NumW2s, int NumMisses ) AfterLifeChanged(); } -void LifeMeterBar::ForceFail() -{ - m_fLifePercentage = 0; - AfterLifeChanged(); -} - - /* * (c) 2001-2004 Chris Danford * All rights reserved. diff --git a/stepmania/src/LifeMeterBar.h b/stepmania/src/LifeMeterBar.h index 51584c7ffb..db739dd3ce 100644 --- a/stepmania/src/LifeMeterBar.h +++ b/stepmania/src/LifeMeterBar.h @@ -29,7 +29,6 @@ public: virtual bool IsHot() const; virtual bool IsFailing() const; virtual float GetLife() const { return m_fLifePercentage; } - virtual void ForceFail(); void UpdateNonstopLifebar(int cleared, int total, int ProgressiveLifebarDifficulty); void FillForHowToPlay(int NumT2s, int NumMisses); diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index 855f3a31af..572857afff 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -166,12 +166,6 @@ float LifeMeterBattery::GetLife() const return float(m_iLivesLeft) / GAMESTATE->m_SongOptions.GetSong().m_iBatteryLives; } -void LifeMeterBattery::ForceFail() -{ - m_iLivesLeft = 0; - Refresh(); -} - void LifeMeterBattery::Refresh() { if( m_iLivesLeft <= 4 ) diff --git a/stepmania/src/LifeMeterBattery.h b/stepmania/src/LifeMeterBattery.h index dde458731e..750d6a52b8 100644 --- a/stepmania/src/LifeMeterBattery.h +++ b/stepmania/src/LifeMeterBattery.h @@ -29,7 +29,6 @@ public: virtual bool IsFailing() const; virtual float GetLife() const; virtual void UpdateNonstopLifebar(int cleared, int total, int ProgressiveLifebarDifficulty) { }; - virtual void ForceFail(); void Refresh(); diff --git a/stepmania/src/LifeMeterTime.cpp b/stepmania/src/LifeMeterTime.cpp index f2e2200edf..eb4121769c 100644 --- a/stepmania/src/LifeMeterTime.cpp +++ b/stepmania/src/LifeMeterTime.cpp @@ -171,11 +171,6 @@ float LifeMeterTime::GetLife() const return fPercent; } -void LifeMeterTime::ForceFail() -{ - m_fLifeTotalLostSeconds = m_fLifeTotalGainedSeconds + 100; -} - float LifeMeterTime::GetLifeSeconds() const { float fSecs = m_fLifeTotalGainedSeconds - (m_fLifeTotalLostSeconds + STATSMAN->m_CurStageStats.fStepsSeconds); diff --git a/stepmania/src/LifeMeterTime.h b/stepmania/src/LifeMeterTime.h index fdc3c57fe4..d4d3860ede 100644 --- a/stepmania/src/LifeMeterTime.h +++ b/stepmania/src/LifeMeterTime.h @@ -31,7 +31,6 @@ public: virtual bool IsFailing() const; virtual float GetLife() const; virtual void UpdateNonstopLifebar(int cleared, int total, int ProgressiveLifebarDifficulty) { }; - virtual void ForceFail(); private: float GetLifeSeconds() const;