From ee3764a2ed626fada98313cb6f013fd71befa3b9 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 10 Apr 2005 01:24:00 +0000
Subject: [PATCH] use graphic for life meter background

---
 stepmania/src/LifeMeterBar.cpp | 28 +++++++++++++++++-----------
 stepmania/src/LifeMeterBar.h   |  4 +++-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index e4975f2df0..f30e215666 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -10,6 +10,8 @@
 #include "StatsManager.h"
 #include "ThemeMetric.h"
 #include "PlayerState.h"
+#include "Quad.h"
+#include "ActorUtil.h"
 
 
 static ThemeMetric<float> METER_WIDTH		("LifeMeterBar","MeterWidth");
@@ -216,8 +218,6 @@ public:
 
 LifeMeterBar::LifeMeterBar()
 {
-	m_pStream = new LifeMeterStream;
-
 	switch( GAMESTATE->m_SongOptions.m_DrainType )
 	{
 	case SongOptions::DRAIN_NORMAL:
@@ -237,17 +237,9 @@ LifeMeterBar::LifeMeterBar()
 	m_fHotAlpha = 0;
 	m_bFailedEarlier = false;
 
-	// set up lifebar
 	m_fBaseLifeDifficulty = PREFSMAN->m_fLifeDifficultyScale;
 	m_fLifeDifficulty = m_fBaseLifeDifficulty;
 
-	m_quadBlackBackground.SetDiffuse( RageColor(0,0,0,1) );
-	m_quadBlackBackground.SetZoomX( (float)METER_WIDTH );
-	m_quadBlackBackground.SetZoomY( (float)METER_HEIGHT );
-
-	this->AddChild( &m_quadBlackBackground );
-	this->AddChild( m_pStream );
-
 	// set up progressive lifebar
 	m_iProgressiveLifebar = PREFSMAN->m_iProgressiveLifebar;
 	m_iMissCombo = 0;
@@ -255,6 +247,20 @@ LifeMeterBar::LifeMeterBar()
 	// set up combotoregainlife
 	m_iComboToRegainLife = 0;
 
+	m_sprBackground.Load( THEME->GetPathG("LifeMeterBar","background") );
+	m_sprBackground->SetName( "Background" );
+	m_sprBackground->ZoomToWidth( METER_WIDTH );
+	m_sprBackground->ZoomToHeight( METER_HEIGHT );
+	this->AddChild( m_sprBackground );
+
+	m_quadDangerGlow.ZoomToWidth( METER_WIDTH );
+	m_quadDangerGlow.ZoomToHeight( METER_HEIGHT );
+	m_quadDangerGlow.SetDiffuse( RageColor(1,0,0,1) );
+	this->AddChild( &m_quadDangerGlow );
+
+	m_pStream = new LifeMeterStream;
+	this->AddChild( m_pStream );
+
 	AfterLifeChanged();
 }
 
@@ -526,7 +532,7 @@ void LifeMeterBar::DrawPrimitives()
 		fPercentRed = 0;
 	else if( m_fTrailingLifePercentage<DANGER_THRESHOLD ) 
 		fPercentRed = RageFastSin( RageTimer::GetTimeSinceStartFast()*PI*4 )/2+0.5f;
-	m_quadBlackBackground.SetDiffuse( RageColor(fPercentRed*0.8f,0,0,1) );
+	m_quadDangerGlow.SetDiffuseAlpha( fPercentRed*0.8f );
 
 	ActorFrame::DrawPrimitives();
 }
diff --git a/stepmania/src/LifeMeterBar.h b/stepmania/src/LifeMeterBar.h
index eddd4d2b03..13ce16325a 100644
--- a/stepmania/src/LifeMeterBar.h
+++ b/stepmania/src/LifeMeterBar.h
@@ -3,6 +3,7 @@
 
 #include "LifeMeter.h"
 #include "Sprite.h"
+#include "AutoActor.h"
 #include "Quad.h"
 class LifeMeterStream;
 
@@ -36,7 +37,8 @@ public:
 private:
 	void ResetBarVelocity();
 
-	Quad		m_quadBlackBackground;
+	AutoActor			m_sprBackground;
+	Quad				m_quadDangerGlow;
 	LifeMeterStream*	m_pStream;
 
 	float		m_fLifePercentage;