From efdcb63f1b00af28c31c6c7217af10c20b2b0ae8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Nov 2006 09:47:44 +0000 Subject: [PATCH] simplify, more consistent --- stepmania/src/LifeMeterBar.cpp | 10 +--------- stepmania/src/LifeMeterBar.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index a951c344cc..31a5a45305 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -264,14 +264,6 @@ void LifeMeterBar::AfterLifeChanged() m_pStream->SetPercent( m_fLifePercentage ); } -bool LifeMeterBar::IsPastPassmark() const -{ - if( m_pPlayerState->m_PlayerOptions.GetSong().m_fPassmark > 0 ) - return m_fLifePercentage >= m_pPlayerState->m_PlayerOptions.GetSong().m_fPassmark; - else - return false; -} - bool LifeMeterBar::IsHot() const { return m_fLifePercentage >= 1; @@ -292,7 +284,7 @@ void LifeMeterBar::Update( float fDeltaTime ) { LifeMeter::Update( fDeltaTime ); - m_fPassingAlpha += IsPastPassmark() ? +fDeltaTime*2 : -fDeltaTime*2; + m_fPassingAlpha += !IsFailing() ? +fDeltaTime*2 : -fDeltaTime*2; CLAMP( m_fPassingAlpha, 0, 1 ); m_fHotAlpha += IsHot() ? + fDeltaTime*2 : -fDeltaTime*2; diff --git a/stepmania/src/LifeMeterBar.h b/stepmania/src/LifeMeterBar.h index 56abc04f13..f51d699115 100644 --- a/stepmania/src/LifeMeterBar.h +++ b/stepmania/src/LifeMeterBar.h @@ -23,7 +23,6 @@ public: virtual void ChangeLife( float fDeltaLifePercent ); virtual void AfterLifeChanged(); virtual bool IsInDanger() const; - virtual bool IsPastPassmark() const; virtual bool IsHot() const; virtual bool IsFailing() const; virtual float GetLife() const { return m_fLifePercentage; }