actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify: danger is danger

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-09 06:43:56 +00:00
parent 346d68545c
commit 49ce79328e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LifeMeterBar.cpp
+1 -1
View File
@@ -315,7 +315,7 @@ void LifeMeterBar::Update( float fDeltaTime )
m_pStream->SetPassingAlpha( m_fPassingAlpha ); m_pStream->SetPassingAlpha( m_fPassingAlpha );
m_pStream->SetHotAlpha( m_fHotAlpha ); 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 ); m_quadDangerGlow.SetDiffuseAlpha( 1 );
else else
m_quadDangerGlow.SetDiffuseAlpha( 0 ); m_quadDangerGlow.SetDiffuseAlpha( 0 );
stepmania/src/LifeMeterTime.cpp
+3 -2
View File
@@ -8,6 +8,7 @@
#include "StreamDisplay.h" #include "StreamDisplay.h"
#include "GameState.h" #include "GameState.h"
#include "StatsManager.h" #include "StatsManager.h"
#include "PlayerState.h"
const float FULL_LIFE_SECONDS = 1.5f*60; const float FULL_LIFE_SECONDS = 1.5f*60;
@@ -126,7 +127,7 @@ void LifeMeterTime::ChangeLife( HoldNoteScore hns, TapNoteScore tns )
bool LifeMeterTime::IsInDanger() const bool LifeMeterTime::IsInDanger() const
{ {
return false; return m_pStream->GetTrailingLifePercent() < DANGER_THRESHOLD;
} }
bool LifeMeterTime::IsHot() const bool LifeMeterTime::IsHot() const
@@ -153,7 +154,7 @@ void LifeMeterTime::Update( float fDeltaTime )
m_pStream->SetPassingAlpha( 0 ); m_pStream->SetPassingAlpha( 0 );
m_pStream->SetHotAlpha( 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 ); m_quadDangerGlow.SetDiffuseAlpha( 1 );
else else
m_quadDangerGlow.SetDiffuseAlpha( 0 ); m_quadDangerGlow.SetDiffuseAlpha( 0 );