From 2836bc7c8159ac59d76994d328102da648242e05 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 27 Apr 2005 09:47:22 +0000
Subject: [PATCH] metrics/element name cleanup

---
 stepmania/src/ScreenEvaluation.cpp | 22 +++++++++++-----------
 stepmania/src/ScreenEvaluation.h   |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 3dbccb6dfc..b426f20fa9 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -453,11 +453,11 @@ void ScreenEvaluation::Init()
 			SET_XY_AND_ON_COMMAND( m_sprGraphFrame[p] );
 			this->AddChild( m_sprGraphFrame[p] );
 
-			m_Graph[p].SetName( ssprintf("GraphP%i",p+1) );
-			m_Graph[p].Load( THEME->GetPathG(m_sName,ssprintf("graph p%i", p+1)), GRAPH_START_HEIGHT );
-			m_Graph[p].LoadFromStageStats( stageStats, stageStats.m_player[p] );
-			SET_XY_AND_ON_COMMAND( m_Graph[p] );
-			this->AddChild( &m_Graph[p] );
+			m_LifeGraph[p].SetName( ssprintf("LifeGraphP%i",p+1) );
+			m_LifeGraph[p].Load( THEME->GetPathG(m_sName,ssprintf("LifeGraph p%i", p+1)), GRAPH_START_HEIGHT );
+			m_LifeGraph[p].LoadFromStageStats( stageStats, stageStats.m_player[p] );
+			SET_XY_AND_ON_COMMAND( m_LifeGraph[p] );
+			this->AddChild( &m_LifeGraph[p] );
 		}
 	}
 
@@ -465,11 +465,11 @@ void ScreenEvaluation::Init()
 	{
 		FOREACH_EnabledPlayer( p )
 		{
-			m_Combo[p].SetName( m_sName, ssprintf("ComboP%i",p+1) );
-			m_Combo[p].Load( m_sName, ssprintf("combo p%i",p+1), stageStats, stageStats.m_player[p] );
-			SET_XY_AND_ON_COMMAND( m_Combo[p] );
+			m_ComboGraph[p].SetName( m_sName, ssprintf("ComboGraphP%i",p+1) );
+			m_ComboGraph[p].Load( m_sName, ssprintf("ComboGraph p%i",p+1), stageStats, stageStats.m_player[p] );
+			SET_XY_AND_ON_COMMAND( m_ComboGraph[p] );
 
-			this->AddChild( &m_Combo[p] );
+			this->AddChild( &m_ComboGraph[p] );
 		}
 	}
 
@@ -1146,7 +1146,7 @@ void ScreenEvaluation::TweenOffScreen()
 		FOREACH_EnabledPlayer( p ) 
 		{
 			OFF_COMMAND( m_sprGraphFrame[p] );
-			OFF_COMMAND( m_Graph[p] );
+			OFF_COMMAND( m_LifeGraph[p] );
 		}
 	}
 
@@ -1154,7 +1154,7 @@ void ScreenEvaluation::TweenOffScreen()
 	{
 		FOREACH_EnabledPlayer( p ) 
 		{
-			OFF_COMMAND( m_Combo[p] );
+			OFF_COMMAND( m_ComboGraph[p] );
 		}
 	}
 
diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h
index b755888d15..97861f2f53 100644
--- a/stepmania/src/ScreenEvaluation.h
+++ b/stepmania/src/ScreenEvaluation.h
@@ -78,10 +78,10 @@ protected:
 
 	// graph area
 	AutoActor			m_sprGraphFrame[NUM_PLAYERS];
-	GraphDisplay		m_Graph[NUM_PLAYERS];
+	GraphDisplay		m_LifeGraph[NUM_PLAYERS];
 
 	// combo area
-	ComboGraph			m_Combo[NUM_PLAYERS];
+	ComboGraph			m_ComboGraph[NUM_PLAYERS];
 
 	// points area
 	bool				m_bNewSongsUnlocked;