From 49ce79328e6d84f32943e7e61b9bfc45780a4da1 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Nov 2006 06:43:56 +0000 Subject: [PATCH] simplify: danger is danger --- stepmania/src/LifeMeterBar.cpp | 2 +- stepmania/src/LifeMeterTime.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp index 41b3c6e36e..c0a7f13956 100644 --- a/stepmania/src/LifeMeterBar.cpp +++ b/stepmania/src/LifeMeterBar.cpp @@ -315,7 +315,7 @@ void LifeMeterBar::Update( float fDeltaTime ) m_pStream->SetPassingAlpha( m_fPassingAlpha ); m_pStream->SetHotAlpha( m_fHotAlpha ); - if( m_fLifePercentage < DANGER_THRESHOLD && !GAMESTATE->IsPlayerDead(m_pPlayerState) ) + if( m_pPlayerState->m_HealthState == PlayerState::DANGER ) m_quadDangerGlow.SetDiffuseAlpha( 1 ); else m_quadDangerGlow.SetDiffuseAlpha( 0 ); diff --git a/stepmania/src/LifeMeterTime.cpp b/stepmania/src/LifeMeterTime.cpp index ef3c860b6b..3f6a39bf21 100644 --- a/stepmania/src/LifeMeterTime.cpp +++ b/stepmania/src/LifeMeterTime.cpp @@ -8,6 +8,7 @@ #include "StreamDisplay.h" #include "GameState.h" #include "StatsManager.h" +#include "PlayerState.h" const float FULL_LIFE_SECONDS = 1.5f*60; @@ -126,7 +127,7 @@ void LifeMeterTime::ChangeLife( HoldNoteScore hns, TapNoteScore tns ) bool LifeMeterTime::IsInDanger() const { - return false; + return m_pStream->GetTrailingLifePercent() < DANGER_THRESHOLD; } bool LifeMeterTime::IsHot() const @@ -153,7 +154,7 @@ void LifeMeterTime::Update( float fDeltaTime ) m_pStream->SetPassingAlpha( 0 ); m_pStream->SetHotAlpha( 0 ); - if( m_pStream->GetTrailingLifePercent() < DANGER_THRESHOLD && !GAMESTATE->IsPlayerDead(m_pPlayerState) ) + if( m_pPlayerState->m_HealthState == PlayerState::DANGER ) m_quadDangerGlow.SetDiffuseAlpha( 1 ); else m_quadDangerGlow.SetDiffuseAlpha( 0 );