From 480088576ae18c1f38af22532e4688bced76ca74 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 23 Feb 2005 22:14:31 +0000
Subject: [PATCH] load metrics from m_sType, not m_sName

---
 stepmania/src/DifficultyMeter.cpp | 34 ++++++++++++++++---------------
 stepmania/src/DifficultyMeter.h   | 13 ++++++++++--
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp
index f356afe935..b3cb411605 100644
--- a/stepmania/src/DifficultyMeter.cpp
+++ b/stepmania/src/DifficultyMeter.cpp
@@ -45,18 +45,20 @@ DifficultyMeter::DifficultyMeter()
 
 void DifficultyMeter::Load( const CString &sType )
 {
+	m_sType = sType;
+
 	/* We can't use global ThemeMetric<CString>s, because we can have multiple
 	 * DifficultyMeters on screen at once, with different names. */
-	m_iNumFeetInMeter = THEME->GetMetricI(sType,"NumFeetInMeter");
-	m_iMaxFeetInMeter = THEME->GetMetricI(sType,"MaxFeetInMeter");
-	m_iGlowIfMeterGreaterThan = THEME->GetMetricI(sType,"GlowIfMeterGreaterThan");
-	m_bShowFeet = THEME->GetMetricB(sType,"ShowFeet");
+	m_iNumFeetInMeter = THEME->GetMetricI(m_sType,"NumFeetInMeter");
+	m_iMaxFeetInMeter = THEME->GetMetricI(m_sType,"MaxFeetInMeter");
+	m_iGlowIfMeterGreaterThan = THEME->GetMetricI(m_sType,"GlowIfMeterGreaterThan");
+	m_bShowFeet = THEME->GetMetricB(m_sType,"ShowFeet");
 	/* "easy", "hard" */
-	m_bShowDifficulty = THEME->GetMetricB(sType,"ShowDifficulty");
+	m_bShowDifficulty = THEME->GetMetricB(m_sType,"ShowDifficulty");
 	/* 3, 9 */
-	m_bShowMeter = THEME->GetMetricB(sType,"ShowMeter");
-	m_bFeetIsDifficultyColor = THEME->GetMetricB(sType,"FeetIsDifficultyColor");
-	m_bFeetPerDifficulty = THEME->GetMetricB(sType,"FeetPerDifficulty");
+	m_bShowMeter = THEME->GetMetricB(m_sType,"ShowMeter");
+	m_bFeetIsDifficultyColor = THEME->GetMetricB(m_sType,"FeetIsDifficultyColor");
+	m_bFeetPerDifficulty = THEME->GetMetricB(m_sType,"FeetPerDifficulty");
 
 	if( m_bShowFeet )
 	{
@@ -70,24 +72,24 @@ void DifficultyMeter::Load( const CString &sType )
 		}
 		else
 			Feet = "0X";
-		m_textFeet.LoadFromTextureAndChars( THEME->GetPathG(sType,"bar"), Feet );
-		SET_XY_AND_ON_COMMAND( &m_textFeet );
+		m_textFeet.LoadFromTextureAndChars( THEME->GetPathG(m_sType,"bar"), Feet );
+		ActorUtil::SetXYAndOnCommand( m_textFeet, m_sType );
 		this->AddChild( &m_textFeet );
 	}
 
 	if( m_bShowDifficulty )
 	{
-		m_Difficulty.Load( THEME->GetPathG(sType,"difficulty") );
+		m_Difficulty.Load( THEME->GetPathG(m_sType,"difficulty") );
 		m_Difficulty->SetName( "Difficulty" );
-		SET_XY_AND_ON_COMMAND( m_Difficulty );
+		ActorUtil::SetXYAndOnCommand( m_Difficulty, m_sType );
 		this->AddChild( m_Difficulty );
 	}
 
 	if( m_bShowMeter )
 	{
 		m_textMeter.SetName( "Meter" );
-		m_textMeter.LoadFromFont( THEME->GetPathF(sType,"meter") );
-		SET_XY_AND_ON_COMMAND( m_textMeter );
+		m_textMeter.LoadFromFont( THEME->GetPathF(m_sType,"meter") );
+		ActorUtil::SetXYAndOnCommand( m_textMeter, m_sType );
 		this->AddChild( &m_textMeter );
 	}
 
@@ -203,9 +205,9 @@ void DifficultyMeter::SetDifficulty( CString diff )
 	m_CurDifficulty = diff;
 
 	if( m_bShowDifficulty )
-		COMMAND( m_Difficulty, "Set" + Capitalize(diff) );
+		ActorUtil::RunCommand( m_Difficulty, m_sType, "Set" + Capitalize(diff) );
 	if( m_bShowMeter )
-		COMMAND( m_textMeter, "Set" + Capitalize(diff) );
+		ActorUtil::RunCommand( m_textMeter, m_sType, "Set" + Capitalize(diff) );
 }
 
 /*
diff --git a/stepmania/src/DifficultyMeter.h b/stepmania/src/DifficultyMeter.h
index c64e0cb192..5eb40b0a3f 100644
--- a/stepmania/src/DifficultyMeter.h
+++ b/stepmania/src/DifficultyMeter.h
@@ -23,8 +23,15 @@ public:
 	static int Load( T* p, lua_State *L )		{ p->Load( SArg(1) ); return 0; }
 	static int SetFromSteps( T* p, lua_State *L )
 	{ 
-		if( lua_isnil(L,1) ) { p->SetFromSteps( NULL ); }
-		else { Steps *pS = Luna<Steps>::check(L,1); p->SetFromSteps( pS ); }
+		if( lua_isnil(L,1) )
+		{
+			p->SetFromSteps( NULL );
+		}
+		else
+		{
+			Steps *pS = Luna<Steps>::check(L,1);
+			p->SetFromSteps( pS );
+		}
 		return 0;
 	}
 
@@ -55,6 +62,8 @@ private:
 	void SetFromDifficulty( Difficulty dc );
 	void SetFromCourseDifficulty( CourseDifficulty cd );
 
+	CString			m_sType;
+
 	void SetDifficulty( CString diff );
 	BitmapText		m_textFeet;